Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
a56cec11
Commit
a56cec11
authored
Aug 29, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
specify gitolite-admin owner in config
parent
ad3a88cf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
12 deletions
+6
-12
config/gitlab.yml.example
config/gitlab.yml.example
+1
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+4
-0
lib/gitlab/backend/gitolite_config.rb
lib/gitlab/backend/gitolite_config.rb
+1
-12
No files found.
config/gitlab.yml.example
View file @
a56cec11
...
...
@@ -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
...
...
config/initializers/1_settings.rb
View file @
a56cec11
...
...
@@ -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
...
...
lib/gitlab/backend/gitolite_config.rb
View file @
a56cec11
...
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment