summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-04-17 17:49:34 +0200
committerRémy Coutable <remy@rymai.me>2019-04-17 17:49:34 +0200
commit6bb48db09da54c8e6e3691e8da13e22ff3ee377a (patch)
tree4ff47bc500727a26df4016c34332a23080e1854d
parent6ef494369dc415c869ff31d717398d2a461552f6 (diff)
downloadgitlab-ce-support-ci-files-in-reviewer-roulette.tar.gz
Support files under .gitlab/ci/ in the reviewer roulettesupport-ci-files-in-reviewer-roulette
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--lib/gitlab/danger/helper.rb3
-rw-r--r--spec/lib/gitlab/danger/helper_spec.rb1
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/danger/helper.rb b/lib/gitlab/danger/helper.rb
index d347f3c13a4..d7b45cd2734 100644
--- a/lib/gitlab/danger/helper.rb
+++ b/lib/gitlab/danger/helper.rb
@@ -136,7 +136,8 @@ module Gitlab
%r{\A(ee/)?spec/(?!javascripts|frontend)[^/]+} => :backend,
%r{\A(ee/)?vendor/(?!assets)[^/]+} => :backend,
%r{\A(ee/)?vendor/(languages\.yml|licenses\.csv)\z} => :backend,
- %r{\A(Dangerfile|Gemfile|Gemfile.lock|Procfile|Rakefile|\.gitlab-ci\.yml)\z} => :backend,
+ %r{\A(Dangerfile|Gemfile|Gemfile.lock|Procfile|Rakefile)\z} => :backend,
+ %r{\A(\.gitlab-ci\.yml|\.gitlab/ci/.+)\z} => :backend,
%r{\A[A-Z_]+_VERSION\z} => :backend,
%r{\A(ee/)?db/} => :database,
diff --git a/spec/lib/gitlab/danger/helper_spec.rb b/spec/lib/gitlab/danger/helper_spec.rb
index 66cd8171c12..2416cfa6448 100644
--- a/spec/lib/gitlab/danger/helper_spec.rb
+++ b/spec/lib/gitlab/danger/helper_spec.rb
@@ -253,6 +253,7 @@ describe Gitlab::Danger::Helper do
'Procfile' | :backend
'Rakefile' | :backend
'.gitlab-ci.yml' | :backend
+ '.gitlab/ci/global.gitlab-ci.yml' | :backend
'FOO_VERSION' | :backend
'ee/FOO_VERSION' | :unknown