Merge branch '42569-lint-changelog-yaml-script-is-run-twice-in-ci' into 'master'

Don't run scripts/lint-changelog-yaml in scripts/static-analysis but only in the 'docs lint' job Closes #42569 See merge request gitlab-org/gitlab-ce!16790

Merge branch '42569-lint-changelog-yaml-script-is-run-twice-in-ci' into 'master'
c7f70155 · Grzegorz Bizon · 8957947e · 33ed9622 · c7f70155
Commit c7f70155 authored Jan 30, 2018 by Grzegorz Bizon
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

static-analysis scripts/static-analysis +0 -1

No files found.
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -35,7 +35,6 @@ tasks = [
  %w[bundle exec rubocop --parallel],
  %w[bundle exec rake gettext:lint],
  %w[bundle exec rake lint:static_verification],
-  %w[scripts/lint-changelog-yaml],
  %w[scripts/lint-conflicts.sh],
  %w[scripts/lint-rugged]
 ]