Rémy Coutable 57dddacf51 Merge branch '32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file' into 'master' ... Resolve "Merge conflict resolution removed the newline in the end of file" Closes #32983 See merge request !11817		2017-06-02 15:48:38 +00:00
..
conflicts	Keep trailing newline when picking conflict sections	2017-06-01 14:04:21 +01:00
add_todo_when_build_fails_service.rb
assign_issues_service.rb	Backport of multiple_assignees_feature [ci skip]	2017-05-04 17:11:53 +03:00
base_service.rb	Backport of multiple_assignees_feature [ci skip]	2017-05-04 17:11:53 +03:00
build_service.rb
close_service.rb	Fix counters cache invalidation for Issues and Merge Requests	2017-05-26 17:43:51 +03:00
create_from_issue_service.rb	Allow to create new branch and empty WIP merge request from issue page	2017-05-04 08:09:21 +00:00
create_service.rb	Fix race condition between pipeline creation and MR diff_head_sha update	2017-06-01 13:31:52 -05:00
get_urls_service.rb
merge_request_diff_cache_service.rb
merge_service.rb
merge_when_pipeline_succeeds_service.rb
post_merge_service.rb	Fix counters cache invalidation for Issues and Merge Requests	2017-05-26 17:43:51 +03:00
refresh_service.rb	Add system note with link to diff comparison when MR discussion becomes outdated	2017-05-23 16:27:30 -05:00
reopen_service.rb	Fix counters cache invalidation for Issues and Merge Requests	2017-05-26 17:43:51 +03:00
resolved_discussion_notification_service.rb
update_service.rb	Backport of multiple_assignees_feature [ci skip]	2017-05-04 17:11:53 +03:00