diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-23 20:47:40 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-23 20:47:40 +0000 |
| commit | 3cbacad86c2eac40fb1f41cf6afffb7ac53a881e (patch) | |
| tree | ca2dfd041a07a13d5a1e037a138a41290eb2c802 /lib | |
| parent | fcbf9841c745cc4eb26f7911e273d5a6ae6afd89 (diff) | |
| parent | abb415276f3854f09dc06f68523f10e927ecc5c3 (diff) | |
| download | gitlab-ce-3cbacad86c2eac40fb1f41cf6afffb7ac53a881e.tar.gz | |
Merge branch 'blacklist/unsubscribes' into 'master'
Add 'unsubscribes' to the paths blacklist
This is to prevent issues with the admin email feature in GitLab EE.
See merge request !1034
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/blacklist.rb | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/lib/gitlab/blacklist.rb b/lib/gitlab/blacklist.rb index 6bc2c3b487c..a47d120dd21 100644 --- a/lib/gitlab/blacklist.rb +++ b/lib/gitlab/blacklist.rb @@ -3,7 +3,30 @@ module Gitlab extend self def path - %w(admin dashboard files groups help profile projects search public assets u s teams merge_requests issues users snippets services repository hooks notes) + %w( + admin + dashboard + files + groups + help + profile + projects + search + public + assets + u + s + teams + merge_requests + issues + users + snippets + services + repository + hooks + notes + unsubscribes + ) end end end |