summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-02-14 16:39:24 +0000
committerNick Thomas <nick@gitlab.com>2019-02-14 16:39:24 +0000
commitbbd0a2ce91f2d43350382c7ce83729f33c39c125 (patch)
tree053b34a7992b91a3f3c9bce9ce1c0cf87514c9eb
parent1de3f631c46fb3a298ca3197cae750436a0414ea (diff)
parente3b79499f57be32b51c0f0baf1f1cc74626e6a2b (diff)
downloadgitlab-ce-bbd0a2ce91f2d43350382c7ce83729f33c39c125.tar.gz
Merge branch 'make-danger-ask-for-backend-review-for-.gitlab-ci.yml' into 'master'
Make Danger as for backend review for .gitlab-ci.yml See merge request gitlab-org/gitlab-ce!25251
-rw-r--r--lib/gitlab/danger/helper.rb2
-rw-r--r--spec/lib/gitlab/danger/helper_spec.rb13
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/gitlab/danger/helper.rb b/lib/gitlab/danger/helper.rb
index 80760e41c7d..b8428637e19 100644
--- a/lib/gitlab/danger/helper.rb
+++ b/lib/gitlab/danger/helper.rb
@@ -114,7 +114,7 @@ module Gitlab
%r{\A(ee/)?spec/(?!javascripts)[^/]+} => :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)\z} => :backend,
+ %r{\A(Dangerfile|Gemfile|Gemfile.lock|Procfile|Rakefile|\.gitlab-ci\.yml)\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 75080aacd96..ac3e4b04230 100644
--- a/spec/lib/gitlab/danger/helper_spec.rb
+++ b/spec/lib/gitlab/danger/helper_spec.rb
@@ -244,12 +244,13 @@ describe Gitlab::Danger::Helper do
'vendor/languages.yml' | :backend
'vendor/licenses.csv' | :backend
- 'Dangerfile' | :backend
- 'Gemfile' | :backend
- 'Gemfile.lock' | :backend
- 'Procfile' | :backend
- 'Rakefile' | :backend
- 'FOO_VERSION' | :backend
+ 'Dangerfile' | :backend
+ 'Gemfile' | :backend
+ 'Gemfile.lock' | :backend
+ 'Procfile' | :backend
+ 'Rakefile' | :backend
+ '.gitlab-ci.yml' | :backend
+ 'FOO_VERSION' | :backend
'ee/FOO_VERSION' | :unknown