diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-02-27 18:53:47 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-02-27 18:53:47 +0000 |
| commit | 177f9ca88b4d080e91b6c4ce2bba04d2fba95c07 (patch) | |
| tree | 6277852811966108c59a4f795f2003a61bda9293 | |
| parent | 543316bca9454b4c468004c4cebcb76558378b98 (diff) | |
| parent | f497c0f236fdb4714eade2054c48fa60f4d91791 (diff) | |
| download | gitlab-ce-177f9ca88b4d080e91b6c4ce2bba04d2fba95c07.tar.gz | |
Merge branch 'danger-ignores-gitlab-pot' into 'master'
Danger ignores gitlab.pot
See merge request gitlab-org/gitlab-ce!25594
| -rw-r--r-- | lib/gitlab/danger/helper.rb | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/danger/helper_spec.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/danger/helper.rb b/lib/gitlab/danger/helper.rb index d3c86fdb629..d2b7ca015d4 100644 --- a/lib/gitlab/danger/helper.rb +++ b/lib/gitlab/danger/helper.rb @@ -123,6 +123,7 @@ module Gitlab # Files that don't fit into any category are marked with :none %r{\A(ee/)?changelogs/} => :none, + %r{\Alocale/gitlab\.pot\z} => :none, # Fallbacks in case the above patterns miss anything %r{\.rb\z} => :backend, diff --git a/spec/lib/gitlab/danger/helper_spec.rb b/spec/lib/gitlab/danger/helper_spec.rb index 00cb1e6446a..66cd8171c12 100644 --- a/spec/lib/gitlab/danger/helper_spec.rb +++ b/spec/lib/gitlab/danger/helper_spec.rb @@ -265,6 +265,7 @@ describe Gitlab::Danger::Helper do 'changelogs/foo' | :none 'ee/changelogs/foo' | :none + 'locale/gitlab.pot' | :none 'FOO' | :unknown 'foo' | :unknown |