summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2019-03-25 15:05:56 +0000
committerMike Greiling <mike@pixelcog.com>2019-03-25 15:05:56 +0000
commit722ac2c9ae6663e9cca9239e33a2a5c3d7e1c828 (patch)
treea0f714dd5c6e78e8c3a81460ab2a3efc07b8676a
parentf0ce30bb83f07dad889bcee5dcb0571e571531d1 (diff)
parentec33bc71e923128ffcdabbaf58c96d9cb0794a25 (diff)
downloadgitlab-ce-722ac2c9ae6663e9cca9239e33a2a5c3d7e1c828.tar.gz
Merge branch 'winh-eslint-config-danger' into 'master'
Mark .eslintrc.yml as frontend change for Danger See merge request gitlab-org/gitlab-ce!26549
-rw-r--r--lib/gitlab/danger/helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/danger/helper.rb b/lib/gitlab/danger/helper.rb
index d2b7ca015d4..0d76e324d10 100644
--- a/lib/gitlab/danger/helper.rb
+++ b/lib/gitlab/danger/helper.rb
@@ -108,7 +108,7 @@ module Gitlab
%r{\A(ee/)?public/} => :frontend,
%r{\A(ee/)?spec/(javascripts|frontend)/} => :frontend,
%r{\A(ee/)?vendor/assets/} => :frontend,
- %r{\A(jest\.config\.js|package\.json|yarn\.lock)\z} => :frontend,
+ %r{\A(jest\.config\.js|package\.json|yarn\.lock|\.eslintrc\.yml)\z} => :frontend,
%r{\A(ee/)?app/(?!assets|views)[^/]+} => :backend,
%r{\A(ee/)?(bin|config|danger|generator_templates|lib|rubocop|scripts)/} => :backend,