gitlab-org--gitlab-foss/spec
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
..
config Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02: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
factories Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project 2016-06-20 14:04:14 +00:00
features Merge branch '19008_ci_dropdown_label_fix' into 'master' 2016-06-23 21:46:50 +00:00
finders Revert "squashed merge and fixed conflicts" 2016-06-16 12:59:07 +02:00
fixtures Show proper image ID on registry page 2016-06-21 13:08:10 +02:00
helpers Remove Haml helpers from the visibility level spec. 2016-06-22 16:10:26 -06:00
initializers Fix settings_spec so that it can that run by itself 2016-06-23 22:26:33 -07:00
javascripts Added text_utility to JS tests 2016-06-20 08:54:57 +01:00
lib Support for rendering/redacting multiple documents 2016-06-24 11:46:39 +02:00
mailers Fallback to group's owners/masters when a project has none 2016-06-20 12:10:37 +02:00
models Fix pagination on sorts with lots of ties 2016-06-23 15:26:50 +01:00
requests gitlab-org/gitlab-ce#17818 - add api call for issues by group 2016-06-23 16:31:48 +00:00
routing Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
services Raise a new Gitlab::Access::AccessDeniedError when permission is not enough to destroy a member 2016-06-18 06:06:34 +02:00
support Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 2016-06-16 13:04:00 +02:00
tasks/gitlab Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
views
workers Unify check branch name exist 2016-06-20 21:44:21 +02:00
factories_spec.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
rails_helper.rb
spec_helper.rb Enable Knapsack only in CI environment 2016-06-08 11:43:13 +02:00
teaspoon_env.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00