Sean McGivern 9c12cb5375 Merge branch 'gitaly-conflicts-prep' into 'master' ... Simplify conflict resolver interface See merge request gitlab-org/gitlab-ce!15897		2017-12-15 10:59:21 +00:00
..
conflicts	Simplify conflict resolver interface	2017-12-14 16:02:50 -03:00
add_todo_when_build_fails_service_spec.rb	…
assign_issues_service_spec.rb	…
build_service_spec.rb	Create merge request from email	2017-12-05 08:41:58 +01:00
close_service_spec.rb	…
create_from_issue_service_spec.rb	Execute quick actions when creating MR from issue	2017-12-13 10:40:31 +00:00
create_service_spec.rb	…
ff_merge_service_spec.rb	…
get_urls_service_spec.rb	Add a project forks spec helper	2017-10-07 11:46:23 +02:00
merge_request_diff_cache_service_spec.rb	…
merge_service_spec.rb	Clear caches before updating MR diffs	2017-12-14 11:22:34 +01:00
merge_when_pipeline_succeeds_service_spec.rb	…
post_merge_service_spec.rb	Clear merge requests counter cache after merge	2017-09-28 17:09:35 +01:00
refresh_service_spec.rb	Ensure pippeline corresponds with the sha of an MR	2017-12-05 12:54:10 -02:00
reopen_service_spec.rb	…
resolved_discussion_notification_service_spec.rb	…
update_service_spec.rb	Refactor the way we pass `old associations` to issuable's update services	2017-11-24 13:08:25 +01:00