Robert Speicher e12c18506a Merge branch 'reject-merge-conflicts' into 'master' ... Properly abort a merge when merge conflicts occur If somehow a user attempted to accept a merge request that had conflicts (e.g. the "Accept Merge Request" button or the MR itself was not updated), `MergeService` did not properly detect that a conflict occurred. It would assume that the MR went through without any issues and close the MR as though everything was fine. This could cause data loss if the source branch were removed. Closes #20425 See merge request !5569		2016-07-30 18:05:54 +00:00
..
config	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
controllers	Fix failing CommitController spec	2016-07-28 16:37:03 -04:00
factories	Check for Ci::Build artifacts at database level	2016-07-29 14:08:41 +02:00
features	Merge branch 'fix/import-project-hooks' into 'master'	2016-07-29 17:00:13 +00:00
finders	Fix the title of the toggle dropdown button	2016-07-28 12:20:57 -03:00
fixtures	Merge remote-tracking branch 'upstream/master' into new-issue-by-email	2016-07-26 14:51:52 +08:00
helpers	Improve diff performance by eliminating redundant checks for text blobs	2016-07-29 21:06:50 -07:00
initializers	Ignore invalid trusted proxies in X-Forwarded-For header	2016-07-23 21:06:19 -07:00
javascripts	ES6ify all the things!	2016-07-24 23:45:11 +03:00
lib	Merge branch 'ability-batch-issue-checking' into 'master'	2016-07-29 16:54:37 +00:00
mailers	Make Notify specs more robust by setting up assignee names	2016-07-22 13:54:12 +02:00
models	Merge branch 'ability-batch-issue-checking' into 'master'	2016-07-29 16:54:37 +00:00
requests	Have the branches API work with the new protected branches data model.	2016-07-29 15:20:39 +05:30
routing	Clean up unused routes	2016-07-26 12:06:42 +02:00
services	Properly abort a merge when merge conflicts occur	2016-07-29 11:21:21 -07:00
support	Ensure relative paths for video are rewritten as we do for images	2016-07-26 10:22:17 +02:00
tasks/gitlab	Enable Style/EmptyLines cop, remove redundant ones	2016-07-01 21:56:17 +02:00
uploaders	Remove VideoJS and clean the integration	2016-07-20 11:36:42 +02:00
views	Update to gitlab_git 10.4.1 and take advantage of preserved Ref objects	2016-07-28 12:24:47 -04:00
workers	Merge remote-tracking branch 'upstream/master' into new-issue-by-email	2016-07-27 18:11:50 +08:00
factories_spec.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
rails_helper.rb
simplecov_env.rb	Introduce SimpleCovEnv singleton helper and use it	2016-07-21 12:46:49 +02:00
spec_helper.rb	Introduce SimpleCovEnv singleton helper and use it	2016-07-21 12:46:49 +02:00
teaspoon_env.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00