summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-01-30 14:32:31 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-01-30 14:32:31 +0000
commitc7f70155331bc45f7992a0ff23f61fe0900e39aa (patch)
tree68cce45802c17224e1f9d22206c37ed2a7b5c0fc
parent8957947e8021d04b3294d3644afe3ad91472793a (diff)
parent33ed96229b09c062ec9221b192cf7dd0c214b7a8 (diff)
downloadgitlab-ce-c7f70155331bc45f7992a0ff23f61fe0900e39aa.tar.gz
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
-rwxr-xr-xscripts/static-analysis1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/static-analysis b/scripts/static-analysis
index b3895292ab4..bdb88f3cb57 100755
--- 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]
]