specify gitolite-admin owner in config
This commit is contained in:
parent
ad3a88cfd3
commit
a56cec1132
|
@ -34,6 +34,7 @@ git_host:
|
|||
admin_uri: git@localhost:gitolite-admin
|
||||
base_path: /home/git/repositories/
|
||||
hooks_path: /home/git/.gitolite/hooks/
|
||||
gitolite_admin_key: gitlab
|
||||
git_user: git
|
||||
upload_pack: true
|
||||
receive_pack: true
|
||||
|
|
|
@ -102,6 +102,10 @@ class Settings < Settingslogic
|
|||
git_host['admin_uri'] || 'git@localhost:gitolite-admin'
|
||||
end
|
||||
|
||||
def gitolite_admin_key
|
||||
git_host['gitolite_admin_key'] || 'gitlab'
|
||||
end
|
||||
|
||||
def default_projects_limit
|
||||
app['default_projects_limit'] || 10
|
||||
end
|
||||
|
|
|
@ -148,18 +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 = ""
|
||||
|
||||
# Read gitolite-admin user
|
||||
#
|
||||
begin
|
||||
repo = conf.get_repo("gitolite-admin")
|
||||
owner_name = repo.permissions[0]["RW+"][""][0]
|
||||
raise StandardError if owner_name.blank?
|
||||
rescue => ex
|
||||
puts "Can't determine gitolite-admin owner".red
|
||||
raise StandardError
|
||||
end
|
||||
owner_name = Gitlab.settings.gitolite_admin_key
|
||||
|
||||
# @ALL repos premission for gitolite owner
|
||||
repo_name = "@all"
|
||||
|
|
Loading…
Reference in a new issue