diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-10-18 00:19:40 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-10-18 00:19:40 +0000 |
| commit | 4e6af0c3fa335d138343dce3e0216303a9b1cd79 (patch) | |
| tree | 0dc939f431aab1895efe17be1ed51eff2cc07e71 /config/routes | |
| parent | 8dd8985da2f1c3ed34003c480dfa55d7a3060ebf (diff) | |
| parent | 28dbfd5c4c7793be4147ba217e7d9e162905088b (diff) | |
| download | gitlab-ce-4e6af0c3fa335d138343dce3e0216303a9b1cd79.tar.gz | |
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
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/project.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 2cd8c60794a..711a59df744 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -267,6 +267,7 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: get :commits get :diffs get :conflicts + get :conflict_for_path get :builds get :pipelines get :merge_check |