gitlab-org--gitlab-foss/app
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
..
assets Merge branch 'fix-logo' into 'master' 2016-06-23 22:42:55 +00:00
controllers Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true 2016-06-24 18:33:02 +02:00
finders Ensure Todos counters doesn't count Todos for projects pending delete 2016-06-17 16:17:43 -03:00
helpers Replace Haml with Hamlit. 2016-06-22 16:09:51 -06:00
mailers Fallback to group's owners/masters when a project has none 2016-06-20 12:10:37 +02:00
models Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true 2016-06-24 18:33:02 +02:00
services Merge branch 'fix-auto-mr-close' into 'master' 2016-06-22 01:18:12 +00:00
uploaders
validators
views Support for rendering/redacting multiple documents 2016-06-24 11:46:39 +02:00
workers Merge branch 'repo-check-require-push-events' into 'master' 2016-06-17 19:14:43 +00:00