BigW Consortium Gitlab
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>
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
admin | Loading commit data... | |
ci | Loading commit data... | |
groups | Loading commit data... | |
import | Loading commit data... | |
oauth | Loading commit data... | |
profiles | Loading commit data... | |
projects | Loading commit data... | |
abuse_reports_controller_spec.rb | Loading commit data... | |
application_controller_spec.rb | Loading commit data... | |
autocomplete_controller_spec.rb | Loading commit data... | |
blob_controller_spec.rb | Loading commit data... | |
commit_controller_spec.rb | Loading commit data... | |
groups_controller_spec.rb | Loading commit data... | |
health_check_controller_spec.rb | Loading commit data... | |
help_controller_spec.rb | Loading commit data... | |
invites_controller_spec.rb | Loading commit data... | |
namespaces_controller_spec.rb | Loading commit data... | |
notification_settings_controller_spec.rb | Loading commit data... | |
projects_controller_spec.rb | Loading commit data... | |
registrations_controller_spec.rb | Loading commit data... | |
root_controller_spec.rb | Loading commit data... | |
sent_notifications_controller_spec.rb | Loading commit data... | |
sessions_controller_spec.rb | Loading commit data... | |
snippets_controller_spec.rb | Loading commit data... | |
uploads_controller_spec.rb | Loading commit data... | |
users_controller_spec.rb | Loading commit data... |