Automatic merge of gitlab-org/gitlab-ce master

danger/roulette/Dangerfile

@@ -53,6 +53,9 @@ def build_list(items)
 end
 
 changes = helper.changes_by_category
+
+# Ignore any files that are known but uncategoried. Prompt for any unknown files
+changes.delete(:none)
 categories = changes.keys - [:unknown]
 
 unless changes.empty?

doc/ci/yaml/README.md

@@ -97,9 +97,9 @@ This can be an array or a multi-line string.
 jobs, including failed ones. This has to be an array or a multi-line string.
 
 The `before_script` and the main `script` are concatenated and run in a single context/container.
-The `after_script` is run separately, so depending on the executor, changes done
-outside of the working tree might not be visible, e.g. software installed in the
-`before_script`.
+The `after_script` is run separately. The current working directory is set back to
+default. Depending on the executor, changes done outside of the working tree might
+not be visible, e.g. software installed in the `before_script`.
 
 It's possible to overwrite the globally defined `before_script` and `after_script`
 if you set it per-job:

lib/gitlab/danger/helper.rb

@@ -95,6 +95,7 @@ module Gitlab
 
       CATEGORY_LABELS = {
         docs: "~Documentation",
+        none: "",
         qa: "~QA"
       }.freeze
 
@@ -120,6 +121,9 @@ module Gitlab
         %r{\A(ee/)?db/} => :database,
         %r{\A(ee/)?qa/} => :qa,
 
+        # Files that don't fit into any category are marked with :none
+        %r{\A(ee/)?changelogs/} => :none,
+
         # Fallbacks in case the above patterns miss anything
         %r{\.rb\z} => :backend,
         %r{\.(md|txt)\z} => :docs,

spec/lib/gitlab/danger/helper_spec.rb

@@ -184,7 +184,7 @@ describe Gitlab::Danger::Helper do
 
   describe '#changes_by_category' do
     it 'categorizes changed files' do
-      expect(fake_git).to receive(:added_files) { %w[foo foo.md foo.rb foo.js db/foo qa/foo] }
+      expect(fake_git).to receive(:added_files) { %w[foo foo.md foo.rb foo.js db/foo qa/foo ee/changelogs/foo.yml] }
       allow(fake_git).to receive(:modified_files) { [] }
       allow(fake_git).to receive(:renamed_files) { [] }
 
@@ -193,6 +193,7 @@ describe Gitlab::Danger::Helper do
         database: %w[db/foo],
         docs: %w[foo.md],
         frontend: %w[foo.js],
+        none: %w[ee/changelogs/foo.yml],
         qa: %w[qa/foo],
         unknown: %w[foo]
       )
@@ -260,6 +261,9 @@ describe Gitlab::Danger::Helper do
       'ee/db/foo' | :database
       'ee/qa/foo' | :qa
 
+      'changelogs/foo'    | :none
+      'ee/changelogs/foo' | :none
+
       'FOO'          | :unknown
       'foo'          | :unknown
 
@@ -283,6 +287,7 @@ describe Gitlab::Danger::Helper do
       :docs      | '~Documentation'
       :foo       | '~foo'
       :frontend  | '~frontend'
+      :none      | ''
       :qa        | '~QA'
     end