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
..
avatars_controller_spec.rb	Fix specs	2016-03-21 09:09:59 +01:00
blame_controller_spec.rb	Move a few controller specs to their correct locations	2016-02-18 21:50:49 -05:00
branches_controller_spec.rb	Update test since branch removal does not render template anymore	2016-06-03 10:13:40 +03:00
commit_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
commits_controller_spec.rb	Move a few controller specs to their correct locations	2016-02-18 21:50:49 -05:00
compare_controller_spec.rb	Enable RSpec/NotToNot cop and auto-correct offenses	2016-05-24 15:40:29 -04:00
find_file_controller_spec.rb	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2016-01-07 12:56:18 +01:00
forks_controller_spec.rb	Make better use of the `visibility_level` factory traits	2016-03-08 16:40:45 -05:00
group_links_controller_spec.rb	Enable RSpec/NotToNot cop and auto-correct offenses	2016-05-24 15:40:29 -04:00
imports_controller_spec.rb	Fix denting and spec	2016-03-13 13:44:31 +01:00
issues_controller_spec.rb	Project members with guest role can't access confidential issues	2016-06-13 19:32:00 -03:00
labels_controller_spec.rb	Fix label order by priority on labels page	2016-06-07 14:01:30 +01:00
merge_requests_controller_spec.rb	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
milestones_controller_spec.rb	Fix spec that broke due to fact that iid is needed, not id, for MilestonesController	2015-12-05 00:04:44 -08:00
notes_controller_spec.rb	Update tests on wording	2016-06-06 11:10:10 +02:00
project_members_controller_spec.rb	Fix and remove duplicate specs	2016-06-20 12:36:59 +02:00
protected_branches_controller_spec.rb	Fix broken `project_url` routing when protected branches are accessed with an empty repo	2015-03-01 20:26:21 -08:00
raw_controller_spec.rb	Add workhorse controller and API helpers	2016-06-06 13:16:30 +02:00
refs_controller_spec.rb	Fix Style/AlignHash cop violations	2015-06-22 22:24:39 -07:00
repositories_controller_spec.rb	Add workhorse controller and API helpers	2016-06-06 13:16:30 +02:00
services_controller_spec.rb	Redirect to a default path if HTTP_REFERER is not set	2015-10-20 07:45:48 -07:00
snippets_controller_spec.rb	Ensure private project snippets are not viewable by unauthorized people	2016-03-25 12:33:42 +01:00
todo_controller_spec.rb	Removed update method	2016-06-17 18:31:37 +01:00
tree_controller_spec.rb	Fix specs	2015-12-18 17:09:58 +01:00
uploads_controller_spec.rb	Fix: Images cannot show when projects' path was changed	2015-10-14 18:50:35 +03:00