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
atom Add RTL support to markdown renderer 2016-10-16 17:47:48 +03:30
boards
dashboard
groups/members
issuables
issues
merge_requests Merge branch 'master' into merge-conflicts-editor-2 2016-10-17 10:56:55 +01:00
profiles
projects Fixed find file keyboard navigation 2016-10-17 16:55:34 +01:00
protected_branches
security
tags
todos
users
calendar_spec.rb
ci_lint_spec.rb
commits_spec.rb
compare_spec.rb Fix broken rspec in compare text 2016-10-16 21:09:38 -07:00
container_registry_spec.rb
dashboard_issues_spec.rb
dashboard_milestones_spec.rb
environments_spec.rb
expand_collapse_diffs_spec.rb
gitlab_flavored_markdown_spec.rb
groups_spec.rb
help_pages_spec.rb
issues_spec.rb
login_spec.rb
markdown_spec.rb
milestone_spec.rb
notes_on_merge_requests_spec.rb
participants_autocomplete_spec.rb
password_reset_spec.rb
pipelines_settings_spec.rb
profile_spec.rb
projects_spec.rb
protected_branches_spec.rb
runners_spec.rb
search_spec.rb
signup_spec.rb
snippets_spec.rb
task_lists_spec.rb
triggers_spec.rb
u2f_spec.rb
unsubscribe_links_spec.rb
users_spec.rb Merge branch 'dz-rename-user-routes' into 'master' 2016-10-17 20:47:46 +02:00
variables_spec.rb