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

Merge branch 'blacklist/unsubscribes' into 'master'
3cbacad8 · Dmitriy Zaporozhets · fcbf9841 · abb41527 · 3cbacad8
Commit 3cbacad8 authored Aug 23, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 1 deletion

blacklist.rb lib/gitlab/blacklist.rb +24 -1

No files found.
--- 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