kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/spec/services/merge_requests
History
Stan Hu 5632079c36 Properly clear the merge error upon rebase failure 
If `merge_error` is ever set after a failure, it is never cleared, even
after a subsequent, successful rebase. We now clear this field whenever
a successful rebase occurs.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56139
 		2019-05-15 21:34:59 -07:00
..
conflicts Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
add_todo_when_build_fails_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
assign_issues_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
build_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
close_service_spec.rb Fix environment automatic on_stop trigger 2019-04-30 21:15:39 +07:00
create_from_issue_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
create_service_spec.rb Fix merge request pipeline exist method 2019-05-06 13:20:47 +07:00
delete_non_latest_diffs_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
ff_merge_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
get_urls_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
merge_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
merge_to_ref_service_spec.rb Put some flaky specs in quarantine 2019-04-24 19:02:02 +02:00
merge_when_pipeline_succeeds_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
migrate_external_diffs_service_spec.rb Allow external diffs to be used conditionally 2019-03-27 16:51:33 +00:00
post_merge_service_spec.rb Fix environment automatic on_stop trigger 2019-04-30 21:15:39 +07:00
push_options_handler_service_spec.rb Fix MR assignees for push options 2019-04-09 20:40:12 +01:00
rebase_service_spec.rb Properly clear the merge error upon rebase failure 2019-05-15 21:34:59 -07:00
refresh_service_spec.rb Fix merge request pipeline exist method 2019-05-06 13:20:47 +07:00
reload_diffs_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
reopen_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
resolved_discussion_notification_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
squash_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00
update_service_spec.rb Add frozen_string_literal to spec/services 2019-04-12 10:14:54 +12:00