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
Kazuhiko Shiozaki
gitlab-ce
Commits
3c4689c2
Commit
3c4689c2
authored
Jun 26, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Store satellites lock files inside satellites dir
parent
9f087fb9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
lib/gitlab/satellite/satellite.rb
lib/gitlab/satellite/satellite.rb
+12
-1
No files found.
lib/gitlab/satellite/satellite.rb
View file @
3c4689c2
...
@@ -64,7 +64,8 @@ module Gitlab
...
@@ -64,7 +64,8 @@ module Gitlab
end
end
def
lock_file
def
lock_file
Rails
.
root
.
join
(
"tmp"
,
"satellite_
#{
project
.
id
}
.lock"
)
create_locks_dir
unless
File
.
exists?
(
lock_files_dir
)
File
.
join
(
lock_files_dir
,
"satellite_
#{
project
.
id
}
.lock"
)
end
end
def
path
def
path
...
@@ -114,6 +115,16 @@ module Gitlab
...
@@ -114,6 +115,16 @@ module Gitlab
def
update_from_source!
def
update_from_source!
repo
.
git
.
fetch
({
timeout:
true
},
:origin
)
repo
.
git
.
fetch
({
timeout:
true
},
:origin
)
end
end
# Create directory for stroing
# satellites lock files
def
create_locks_dir
FileUtils
.
mkdir_p
(
lock_files_dir
)
end
def
lock_files_dir
@lock_files_dir
||=
File
.
join
(
Gitlab
.
config
.
satellites
.
path
,
"tmp"
)
end
end
end
end
end
end
end
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