Merge branch 'master' into api_errors_refactoring

2012-09-10 14:10:34 +03:00 · 2012-09-10 14:10:34 +03:00 · e68d0841be
commit e68d0841be
parent a065557208 52d29f5d59
4 changed files with 21 additions and 10 deletions
--- 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"