Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 1 deletions

diff --git a/scripts/lint-changelog-filenames b/scripts/lint-changelog-filenames
new file mode 100755
index 00000000000..2355ac6f7b2
--- /dev/null
+++ b/scripts/lint-changelog-filenames
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+lint_paths="changelogs/unreleased"
+[ -d "ee/" ] && lint_paths="$lint_paths ee/changelogs/unreleased"
+
+invalid_files=$(find $lint_paths -type f -not -name "*.yml" -not -name ".gitkeep")
+
+if [ -n "$invalid_files" ]; then
+    echo "Changelog files must end in .yml, but these did not:"
+    echo "$invalid_files" | sed -e "s/^/* /"
+  exit 1
+fi
diff --git a/scripts/static-analysis b/scripts/static-analysis
index d2d82c19bed..1f55c035ed1 100755
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -48,7 +48,8 @@ def jobs_to_run(node_index, node_total)
     %w[bundle exec rubocop --parallel],
     %w[scripts/lint-conflicts.sh],
     %w[scripts/lint-rugged],
-    %w[scripts/frontend/check_no_partial_karma_jest.sh]
+    %w[scripts/frontend/check_no_partial_karma_jest.sh],
+    %w[scripts/lint-changelog-filenames]
   ]
 
   case node_total