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
Tatuya Kamada
gitlab-ce
Commits
45f11780
Commit
45f11780
authored
Apr 11, 2017
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pipeline related failing specs
parent
d614a9c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+3
-2
No files found.
app/models/ci/pipeline.rb
View file @
45f11780
...
@@ -231,11 +231,12 @@ module Ci
...
@@ -231,11 +231,12 @@ module Ci
end
end
def
cancel_running
def
cancel_running
Gitlab
::
OptimisticLocking
.
retry_lock
(
Gitlab
::
OptimisticLocking
.
retry_lock
(
statuses
.
cancelable
)
do
|
cancelable
|
statuses
.
cancelable
)
do
|
job
|
cancelable
.
find_each
do
|
job
|
yield
(
job
)
if
block_given?
yield
(
job
)
if
block_given?
job
.
cancel
job
.
cancel
end
end
end
end
end
def
auto_cancel_running
(
pipeline
)
def
auto_cancel_running
(
pipeline
)
...
...
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