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
Boxiang Sun
gitlab-ce
Commits
17ad286e
Commit
17ad286e
authored
Jun 09, 2016
by
Z.J. van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename ci_commit to pipeline
parent
3fe4a2f5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
CHANGELOG
CHANGELOG
+1
-1
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+5
-5
No files found.
CHANGELOG
View file @
17ad286e
...
@@ -42,6 +42,7 @@ v 8.9.0 (unreleased)
...
@@ -42,6 +42,7 @@ v 8.9.0 (unreleased)
- Add DB index on users.state
- Add DB index on users.state
- Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
- Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
- Changed the Slack build message to use the singular duration if necessary (Aran Koning)
- Changed the Slack build message to use the singular duration if necessary (Aran Koning)
- Fix race condition on merge when build succeeds
- Links from a wiki page to other wiki pages should be rewritten as expected
- Links from a wiki page to other wiki pages should be rewritten as expected
- Add option to project to only allow merge requests to be merged if the build succeeds (Rui Santos)
- Add option to project to only allow merge requests to be merged if the build succeeds (Rui Santos)
- Fix issues filter when ordering by milestone
- Fix issues filter when ordering by milestone
...
@@ -99,7 +100,6 @@ v 8.9.0 (unreleased)
...
@@ -99,7 +100,6 @@ v 8.9.0 (unreleased)
- Remove tanuki logo from side navigation; center on top nav
- Remove tanuki logo from side navigation; center on top nav
- Include user relationships when retrieving award_emoji
- Include user relationships when retrieving award_emoji
- Various associations are now eager loaded when parsing issue references to reduce the number of queries executed
- Various associations are now eager loaded when parsing issue references to reduce the number of queries executed
- Fix race condition on merge when build succeeds
v 8.8.5 (unreleased)
v 8.8.5 (unreleased)
- Ensure branch cleanup regardless of whether the GitHub import process succeeds
- Ensure branch cleanup regardless of whether the GitHub import process succeeds
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
17ad286e
...
@@ -204,14 +204,14 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -204,14 +204,14 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request
.
update
(
merge_error:
nil
)
@merge_request
.
update
(
merge_error:
nil
)
if
params
[
:merge_when_build_succeeds
].
present?
&&
@merge_request
.
pipeline
&&
@merge_request
.
pipeline
.
active?
if
params
[
:merge_when_build_succeeds
].
present?
if
@merge_request
.
ci_commit
.
active?
if
@merge_request
.
pipeline
&&
@merge_request
.
pipeline
.
active?
MergeRequests
::
MergeWhenBuildSucceedsService
.
new
(
@project
,
current_user
,
merge_params
)
MergeRequests
::
MergeWhenBuildSucceedsService
.
new
(
@project
,
current_user
,
merge_params
)
.
execute
(
@merge_request
)
.
execute
(
@merge_request
)
@status
=
:merge_when_build_succeeds
@status
=
:merge_when_build_succeeds
# This can be triggered when a user clicks the auto merge button while
elsif
@merge_request
.
pipeline
.
success?
# the tests finish at about the same tim
e
# This can be triggered when a user clicks the auto merge button whil
e
elsif
@merge_request
.
ci_commit
.
success?
# the tests finish at about the same time
MergeWorker
.
perform_async
(
@merge_request
.
id
,
current_user
.
id
,
params
)
MergeWorker
.
perform_async
(
@merge_request
.
id
,
current_user
.
id
,
params
)
@status
=
:success
@status
=
:success
else
else
...
...
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