kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/spec
History
Jacob Schatz 4e6af0c3fa Merge branch 'merge-conflicts-editor-2' into 'master' 
Resolve Merge conflicts in editor

## What does this MR do?

This is the second iteration of https://gitlab.com/gitlab-org/gitlab-ce/issues/20344 which now allows to resolve conflicts manually providing an editor to the user.

## Are there points in the code the reviewer needs to double check?

- Previous implementation has been refactored almost from the ground up.
- Also some components like `parallel-conflict-lines` has been optimized to work well with PhantomJS.
- The app and files required files are loaded only when needed. `merge_conflicts_bundle.js` is only loaded in `/<group>/<project>/merge_requests/<Id>/conflicts` only

## Why was this MR needed?

Some MRs were unable to be solved interactively in the UI, with this MR we let the user to manually fix complex merge request conflicts.

## Screenshots (if relevant)

<img src="/uploads/33a016f025bd590b1fc6eeee1ee11626/Screen_Shot_2016-09-19_at_1.39.39_PM.png" width="800">

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20344, https://gitlab.com/gitlab-org/gitlab-ce/issues/3567.

See merge request !6374
 		2016-10-18 00:19:40 +00:00
..
config
…
controllers Merge branch 'master' into merge-conflicts-editor-2 2016-10-17 10:56:55 +01:00
factories Update Boards::CreateService to handle with the has_many association 2016-10-11 11:39:04 -03:00
features Merge branch 'merge-conflicts-editor-2' into 'master' 2016-10-18 00:19:40 +00:00
finders Precalculate trending projects 2016-10-10 12:27:08 +02:00
fixtures Add JSON Schema 2016-10-13 14:16:34 -05:00
helpers refactors tests because of gitlab-test repository changes 2016-10-11 16:33:06 +01:00
initializers
…
javascripts Add tests for gl_field_errors. 2016-10-15 08:28:52 +02:00
lib Merge branch 'master' into merge-conflicts-editor-2 2016-10-17 12:17:12 -05:00
mailers refactors tests because of gitlab-test repository changes 2016-10-11 16:33:06 +01:00
models Merge branch 'master' into merge-conflicts-editor-2 2016-10-17 12:17:12 -05:00
policies Make guests unable to view MRs 2016-10-11 16:51:26 +03:00
requests Revert "Update git over http test to match new routing" 2016-10-15 01:48:14 +03:00
routing Merge branch 'dz-rename-user-routes' into 'master' 2016-10-17 20:47:46 +02:00
services Merge branch 'master' into merge-conflicts-editor-2 2016-10-17 10:56:55 +01:00
support Merge branch 'master' into merge-conflicts-editor-2 2016-10-17 12:17:12 -05:00
tasks/gitlab Add a new gitlab:users:clear_all_authentication_tokens task 2016-10-11 10:21:18 +02:00
uploaders
…
views Show what time ago a MR was deployed 2016-10-14 11:07:00 +02:00
workers Fix broken specs on MySQL after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896 2016-10-17 14:31:43 +02:00
factories_spec.rb
…
rails_helper.rb
…
simplecov_env.rb Bump SimpleCov merge timeout to 365 days 2016-08-22 13:44:14 +02:00
spec_helper.rb Revert "Merge branch 'tests-use-tmpfs' into 'master'" 2016-10-12 14:45:26 +00:00
teaspoon_env.rb
…