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

..

admin

Enable RSpec/NotToNot cop and auto-correct offenses

2016-05-24 15:40:29 -04:00

ci

Redirect to root path when visiting /ci

2016-03-29 08:04:17 +02:00

groups

Fix and remove duplicate specs

2016-06-20 12:36:59 +02:00

import

Remove require_relative 'import_spec_helper'

2016-06-08 18:18:49 +02:00

oauth

Fix endless redirections when accessing user OAuth applications when they are disabled

2016-06-08 05:52:04 -07:00

profiles

Added CHANGELOG item and fixed Rubocop errors

2016-06-14 18:37:22 -05:00

projects

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

abuse_reports_controller_spec.rb

Add AbuseReport#notify

2016-01-04 18:59:42 -05:00

application_controller_spec.rb

Fix rubocop spec.

2016-06-03 10:11:36 +05:30

autocomplete_controller_spec.rb

Merge branch 'master' into assign-to-issuable-opener

2016-04-15 14:38:15 +02:00

blob_controller_spec.rb

Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark

2016-06-12 07:36:25 -07:00

commit_controller_spec.rb

Add support to cherry-pick any commit

2016-04-18 15:39:07 +08:00

groups_controller_spec.rb

Incorportate feedback

2016-06-01 12:10:08 +02:00

health_check_controller_spec.rb

Support token header for health check token, and general cleanup of the health_check feature.

2016-05-11 17:27:08 -07:00

help_controller_spec.rb

Fix Style/AlignHash cop violations

2015-06-22 22:24:39 -07:00

invites_controller_spec.rb

Redirect to a default path if HTTP_REFERER is not set

2015-10-20 07:45:48 -07:00

namespaces_controller_spec.rb

Fix more specs

2016-03-20 23:09:33 +01:00

notification_settings_controller_spec.rb

Re-use notifications dropdown on user profile

2016-06-16 23:34:21 -03:00

projects_controller_spec.rb

Fixed issue with returning ref in commits JSON

2016-06-20 11:37:27 +01:00

registrations_controller_spec.rb

Update tests for the current_application_settings request store changes

2016-05-27 19:05:52 -07:00

root_controller_spec.rb

Implementing 'Groups View' and 'TODOs View' as options for dashboard preferences.

2016-03-24 19:59:54 +01:00

sent_notifications_controller_spec.rb

Move a few controller specs to their correct locations

2016-02-18 21:50:49 -05:00

sessions_controller_spec.rb

Add a U2F-specific audit log entry after logging in.

2016-06-06 12:50:31 +05:30

snippets_controller_spec.rb

Fix raw private snippets access workflow

2015-11-25 18:16:27 -02:00

uploads_controller_spec.rb

Fix more specs

2016-03-20 23:09:33 +01:00

users_controller_spec.rb

Add specs for user routing and update spec for user controller

2016-05-08 22:06:19 +07:00