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
3ffb9cbf
Commit
3ffb9cbf
authored
Jun 04, 2012
by
Zevs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Task#879 Relocated gitolite repo and lock file
parent
a0db028c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
lib/gitlab/gitolite.rb
lib/gitlab/gitolite.rb
+3
-3
No files found.
lib/gitlab/gitolite.rb
View file @
3ffb9cbf
...
...
@@ -16,7 +16,7 @@ module Gitlab
def
pull
# create tmp dir
@local_dir
=
File
.
join
(
Dir
.
tmpdir
,
"gitlabhq-gitolite-
#{
Time
.
now
.
to_i
}
"
)
@local_dir
=
File
.
join
(
Rails
.
root
,
'tmp'
,
"gitlabhq-gitolite-
#{
Time
.
now
.
to_i
}
"
)
Dir
.
mkdir
@local_dir
`git clone
#{
GitHost
.
admin_uri
}
#{
@local_dir
}
/gitolite`
...
...
@@ -33,8 +33,8 @@ module Gitlab
end
def
configure
status
=
Timeout
::
timeout
(
20
)
do
File
.
open
(
File
.
join
(
Dir
.
tmpdir
,
"gitlabhq-gitolite.lock"
),
"w+"
)
do
|
f
|
Timeout
::
timeout
(
20
)
do
File
.
open
(
File
.
join
(
Rails
.
root
,
'tmp'
,
"gitlabhq-gitolite.lock"
),
"w+"
)
do
|
f
|
begin
f
.
flock
(
File
::
LOCK_EX
)
pull
...
...
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