gitlab-org--gitlab-foss/spec/services/merge_requests
Douwe Maan e4261fe3ce Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'
Fix conflict resolution from corrupted upstream

Closes gitlab-ee#2128

See merge request !11298
2017-05-12 20:37:30 +00:00
..
conflicts Fix conflict resolution from corrupted upstream 2017-05-12 20:47:51 +01:00
add_todo_when_build_fails_service_spec.rb Use :empty_project where possible in service specs 2017-03-27 20:44:09 -04:00
assign_issues_service_spec.rb Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
build_service_spec.rb Fix 404 when upstream has disabled merge requests 2017-04-27 01:04:07 +03:00
close_service_spec.rb Revert "Prefer leading style for Style/DotPosition" 2017-02-23 09:33:05 -06:00
create_from_issue_service_spec.rb Allow to create new branch and empty WIP merge request from issue page 2017-05-04 08:09:21 +00:00
create_service_spec.rb Move update_assignee_cache_counts to the service 2017-05-12 14:12:29 +03:00
get_urls_service_spec.rb Auto-correct RSpec/DescribedClass violations 2017-05-01 11:13:33 -04:00
merge_request_diff_cache_service_spec.rb Auto-correct RSpec/DescribedClass violations 2017-05-01 11:13:33 -04:00
merge_service_spec.rb Revert "Prefer leading style for Style/DotPosition" 2017-02-23 09:33:05 -06:00
merge_when_pipeline_succeeds_service_spec.rb Fix specs 2 2017-05-08 11:29:10 -03:00
refresh_service_spec.rb Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
reopen_service_spec.rb Revert "Prefer leading style for Style/DotPosition" 2017-02-23 09:33:05 -06:00
resolved_discussion_notification_service_spec.rb Enable RSpec/FilePath cop 2017-04-26 12:50:32 +01:00
update_service_spec.rb Move update_assignee_cache_counts to the service 2017-05-12 14:12:29 +03:00