Files
gitlabhq/app/models
Rémy Coutable e3d464d82a Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true
The issue was that `MergeRequest#mergeable?` returns false when the CI
state is not success and project.only_allow_merge_if_build_succeeds is
true. In this case `Projects::MergeRequestsController#merge` would
return the `:failed` status when enabling `merge_when_build_succeeds`,
thus leading to a weird state and the MR never automatically merged.

The fix is to disable the CI state check in the controller safeguard
that early return the `:failed` status.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-24 18:33:02 +02:00
..
2016-06-23 12:29:11 +02:00
2016-06-18 05:46:45 +02:00
2011-10-09 00:36:38 +03:00
2016-06-23 16:47:03 +02:00
2016-05-18 08:47:15 -05:00
2016-03-06 23:07:19 -05:00
2016-03-29 12:19:09 +01:00
2016-06-18 05:46:45 +02:00