diff options
| author | Alex Denisov <1101.debian@gmail.com> | 2012-09-10 15:10:34 +0400 |
|---|---|---|
| committer | Alex Denisov <1101.debian@gmail.com> | 2012-09-10 15:10:34 +0400 |
| commit | e68d0841be6e252baf98a045fc5b4bed431f31b2 (patch) | |
| tree | 1f5c5051adc092212218ffd034dce75d89c572f8 /lib | |
| parent | a065557208d6076ec869144346e06c7de714389c (diff) | |
| parent | 52d29f5d5996fd5e5bcd203b5e352afee00f74aa (diff) | |
Merge branch 'master' into api_errors_refactoring
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/backend/gitolite_config.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/backend/gitolite_config.rb b/lib/gitlab/backend/gitolite_config.rb index 60eef8e863b..0d636d2d789 100644 --- a/lib/gitlab/backend/gitolite_config.rb +++ b/lib/gitlab/backend/gitolite_config.rb @@ -148,7 +148,7 @@ module Gitlab # Enable access to all repos for gitolite admin. # We use it for accept merge request feature def admin_all_repo - owner_name = Gitlab.settings.gitolite_admin_key + owner_name = Gitlab.config.gitolite_admin_key # @ALL repos premission for gitolite owner repo_name = "@all" |