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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
99e1f488
Commit
99e1f488
authored
Jul 14, 2014
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove thread-unsafe Dir.chdir from Satellite#lock
This is made possible by changes in gitlab-grit 2.6.10.
parent
25c9bf4b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG
CHANGELOG
+1
-0
Gemfile.lock
Gemfile.lock
+1
-1
lib/gitlab/satellite/satellite.rb
lib/gitlab/satellite/satellite.rb
+1
-1
No files found.
CHANGELOG
View file @
99e1f488
...
@@ -20,6 +20,7 @@ v 7.1.0
...
@@ -20,6 +20,7 @@ v 7.1.0
- Show VERSION information on project sidebar
- Show VERSION information on project sidebar
- Improve branch removal logic when accept MR
- Improve branch removal logic when accept MR
- Fix bug where comment form is spawned inside the Reply button
- Fix bug where comment form is spawned inside the Reply button
- Remove Dir.chdir from Satellite#lock for thread-safety
v 7.0.0
v 7.0.0
- The CPU no longer overheats when you hold down the spacebar
- The CPU no longer overheats when you hold down the spacebar
...
...
Gemfile.lock
View file @
99e1f488
...
@@ -165,7 +165,7 @@ GEM
...
@@ -165,7 +165,7 @@ GEM
multi_json
multi_json
gitlab-grack (2.0.0.pre)
gitlab-grack (2.0.0.pre)
rack (~> 1.5.1)
rack (~> 1.5.1)
gitlab-grit (2.6.
9
)
gitlab-grit (2.6.
10
)
charlock_holmes (~> 0.6)
charlock_holmes (~> 0.6)
diff-lcs (~> 1.1)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
mime-types (~> 1.15)
...
...
lib/gitlab/satellite/satellite.rb
View file @
99e1f488
...
@@ -53,7 +53,7 @@ module Gitlab
...
@@ -53,7 +53,7 @@ module Gitlab
File
.
open
(
lock_file
,
"w+"
)
do
|
f
|
File
.
open
(
lock_file
,
"w+"
)
do
|
f
|
begin
begin
f
.
flock
File
::
LOCK_EX
f
.
flock
File
::
LOCK_EX
Dir
.
chdir
(
path
)
{
return
yield
}
yield
ensure
ensure
f
.
flock
File
::
LOCK_UN
f
.
flock
File
::
LOCK_UN
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