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
Léo-Paul Géneau
gitlab-ce
Commits
6f25967c
Commit
6f25967c
authored
Nov 08, 2012
by
David Barri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue with git commit silently failing.
Also updated status task and installation instuctions.
parent
5add5f76
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
4 deletions
+28
-4
doc/installation.md
doc/installation.md
+8
-0
lib/gitlab/backend/gitolite_config.rb
lib/gitlab/backend/gitolite_config.rb
+2
-2
lib/tasks/gitlab/status.rake
lib/tasks/gitlab/status.rake
+18
-2
No files found.
doc/installation.md
View file @
6f25967c
...
@@ -244,6 +244,14 @@ and ensure you have followed all of the above steps carefully.
...
@@ -244,6 +244,14 @@ and ensure you have followed all of the above steps carefully.
# or sqlite
# or sqlite
sudo -u gitlab -H bundle install --without development test mysql postgres --deployment
sudo -u gitlab -H bundle install --without development test mysql postgres --deployment
#### Configure git client
Gitlab needs to be able to commit and push changes to gitolite.
Git requires a username and email in order to be able to do that.
sudo -u gitlab -H git config --global user.email "gitlab@localhost"
sudo -u gitlab -H git config --global user.name "Gitlab"
#### Setup database
#### Setup database
sudo -u gitlab bundle exec rake gitlab:app:setup RAILS_ENV=production
sudo -u gitlab bundle exec rake gitlab:app:setup RAILS_ENV=production
...
...
lib/gitlab/backend/gitolite_config.rb
View file @
6f25967c
...
@@ -191,8 +191,8 @@ module Gitlab
...
@@ -191,8 +191,8 @@ module Gitlab
def
push
tmp_dir
def
push
tmp_dir
Dir
.
chdir
(
File
.
join
(
tmp_dir
,
"gitolite"
))
Dir
.
chdir
(
File
.
join
(
tmp_dir
,
"gitolite"
))
system
(
'git add -A'
)
raise
"Git add failed."
unless
system
(
'git add -A'
)
system
(
'git commit -am "GitLab"'
)
raise
"Git commit failed."
unless
system
(
'git commit -am "GitLab"'
)
if
system
(
'git push'
)
if
system
(
'git push'
)
Dir
.
chdir
(
Rails
.
root
)
Dir
.
chdir
(
Rails
.
root
)
else
else
...
...
lib/tasks/gitlab/status.rake
View file @
6f25967c
...
@@ -37,9 +37,10 @@ namespace :gitlab do
...
@@ -37,9 +37,10 @@ namespace :gitlab do
return
return
end
end
FileUtils
.
rm_rf
(
"/tmp/gitolite_gitlab_test"
)
begin
begin
`git clone
#{
Gitlab
.
config
.
gitolite_admin_uri
}
/tmp/gitolite_gitlab_test`
`git clone
-q
#{
Gitlab
.
config
.
gitolite_admin_uri
}
/tmp/gitolite_gitlab_test`
FileUtils
.
rm_rf
(
"/tmp/gitolite_gitlab_test"
)
raise
unless
$?
.
success?
print
"Can clone gitolite-admin?............"
print
"Can clone gitolite-admin?............"
puts
"YES"
.
green
puts
"YES"
.
green
rescue
rescue
...
@@ -48,6 +49,21 @@ namespace :gitlab do
...
@@ -48,6 +49,21 @@ namespace :gitlab do
return
return
end
end
begin
Dir
.
chdir
(
"/tmp/gitolite_gitlab_test"
)
do
`touch blah && git add blah && git commit -qm blah -- blah`
raise
unless
$?
.
success?
end
print
"Can git commit?............"
puts
"YES"
.
green
rescue
print
"Can git commit?............"
puts
"NO"
.
red
return
ensure
FileUtils
.
rm_rf
(
"/tmp/gitolite_gitlab_test"
)
end
print
"UMASK for .gitolite.rc is 0007? ............"
print
"UMASK for .gitolite.rc is 0007? ............"
if
open
(
"
#{
git_base_path
}
/../.gitolite.rc"
).
grep
(
/UMASK([ \t]*)=([ \t>]*)0007/
).
any?
if
open
(
"
#{
git_base_path
}
/../.gitolite.rc"
).
grep
(
/UMASK([ \t]*)=([ \t>]*)0007/
).
any?
puts
"YES"
.
green
puts
"YES"
.
green
...
...
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