gitlab-org--gitlab-foss/spec/features
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
..
admin Handle unavailable system info 2016-08-25 08:28:35 +01:00
atom Add RTL support to markdown renderer 2016-10-16 17:47:48 +03:30
boards Fix board relates specs 2016-10-11 11:47:56 -03:00
dashboard Fix snippets pagination 2016-09-26 12:42:12 +02:00
groups/members Tests update 2016-09-13 08:44:59 +01:00
issuables Handle legacy sort order values 2016-08-18 23:26:07 +01:00
issues Merge branch 'master' into revert-c676283b 2016-10-04 08:17:05 +01:00
merge_requests Merge branch 'master' into merge-conflicts-editor-2 2016-10-17 10:56:55 +01:00
profiles Convert "SSH Keys" Spinach features to RSpec 2016-10-03 11:00:05 +02:00
projects Fixed find file keyboard navigation 2016-10-17 16:55:34 +01:00
protected_branches Move protected branches access control spec into a shared example. 2016-08-20 00:24:12 +05:30
security Make guests unable to view MRs 2016-10-11 16:51:26 +03:00
tags Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
todos Added test for due date 2016-10-03 09:55:12 +01:00
users Fix snippets pagination 2016-09-26 12:42:12 +02:00
calendar_spec.rb Changed zero padded days to no padded days in date_format 2016-10-01 12:18:44 -05:00
ci_lint_spec.rb fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
commits_spec.rb fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
compare_spec.rb Fix broken rspec in compare text 2016-10-16 21:09:38 -07:00
container_registry_spec.rb Show proper image ID on registry page 2016-06-21 13:08:10 +02:00
dashboard_issues_spec.rb Small improvements thanks to Robert's feedback 2016-09-30 12:02:54 +02:00
dashboard_milestones_spec.rb
environments_spec.rb Deletes extra empty line breaking the build 2016-10-07 15:56:37 +01:00
expand_collapse_diffs_spec.rb Merge branch '21369-make-it-clearer-that-diffs-can-be-collapsed' into 'master' 2016-10-01 10:59:32 +00:00
gitlab_flavored_markdown_spec.rb fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
groups_spec.rb Move edit group scenario to rspec and refactor groups_spec 2016-10-14 14:51:59 +03:00
help_pages_spec.rb fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
issues_spec.rb Merge branch 'master' into revert-c676283b 2016-10-03 09:10:20 +01:00
login_spec.rb Update filled in field for two_factor auth to use id. 2016-10-15 08:28:53 +02:00
markdown_spec.rb Remove VideoJS and clean the integration 2016-07-20 11:36:42 +02:00
milestone_spec.rb Ensure validation messages are shown within the milestone form 2016-09-19 09:29:12 +01:00
notes_on_merge_requests_spec.rb Adds v-pre to code blocks in comments 2016-10-04 14:06:44 +01:00
participants_autocomplete_spec.rb fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
password_reset_spec.rb
pipelines_settings_spec.rb Create PipelinesSettingsController for showing settings page 2016-07-20 14:39:06 +02:00
profile_spec.rb fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
projects_spec.rb Allow Member.add_user to handle access requesters 2016-09-28 09:43:00 +02:00
protected_branches_spec.rb Move protected branches access control spec into a shared example. 2016-08-20 00:24:12 +05:30
runners_spec.rb Fix grammar and typos in Runners pages 2016-09-28 10:03:59 +02:00
search_spec.rb Fixed search dropdown labels not displaying 2016-09-12 09:00:57 +01:00
signup_spec.rb Make UX upgrades to SignIn/Register views. 2016-10-15 08:27:21 +02:00
snippets_spec.rb Fix snippets pagination 2016-09-26 12:42:12 +02:00
task_lists_spec.rb Shorten task status phrase 2016-08-29 10:46:36 -05:00
triggers_spec.rb Fix failing rspec test for triggers 2016-09-06 11:52:01 +02:00
u2f_spec.rb Make UX upgrades to SignIn/Register views. 2016-10-15 08:27:21 +02:00
unsubscribe_links_spec.rb Wrap List-Unsubscribe link in angle brackets 2016-09-26 16:01:17 +01:00
users_spec.rb Merge branch 'dz-rename-user-routes' into 'master' 2016-10-17 20:47:46 +02:00
variables_spec.rb Updated tests 2016-08-13 00:57:40 -05:00