diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-08 09:50:10 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-08 09:50:10 +0300 |
| commit | 6ace422c298eef2c592d64c08f59b3da3d8d8a6d (patch) | |
| tree | 9a1a43baeab7e73a4a97c9d4be18a2ddbe4f257c /lib | |
| parent | 2882d16e7a244d6627d9f6d9436651a38bf11bad (diff) | |
| parent | 6f5f5e7ee32bbd693796571fa6fcb8575accc08a (diff) | |
| download | gitlab-ce-6ace422c298eef2c592d64c08f59b3da3d8d8a6d.tar.gz | |
Merge branch 'master' into 6-0-dev
Conflicts:
Gemfile
Gemfile.lock
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/blacklist.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/blacklist.rb b/lib/gitlab/blacklist.rb index b678a83fabf..59203b2fbd6 100644 --- a/lib/gitlab/blacklist.rb +++ b/lib/gitlab/blacklist.rb @@ -3,7 +3,7 @@ module Gitlab extend self def path - %w(admin dashboard groups help profile projects search public assets u s teams merge_requests issues users snippets ) + %w(admin dashboard groups help profile projects search public assets u s teams merge_requests issues users snippets services) end end end |