WIP: Merge conflicts editor backend
What does this MR do?
Add a backend to support merge conflicts in an editor. https://gitlab.com/gitlab-org/gitlab-ce/issues/20344#note_14777035 and the commit message for https://gitlab.com/gitlab-org/gitlab-ce/commit/37d81c7fc38af2ac94bf0ae598311640ddc53593 attempt to describe this in words
Are there points in the code the reviewer needs to double check?
I haven't implemented this:
If you've already clicked to pick ours / theirs on the conflict sections, then edit the file, we resolve those conflicts before showing you the file.
I can do, I'm just wondering how the API should work. Do we always POST
to conflict_for_path
, and if the request has sections, resolve those first? We also might not want to do this: https://gitlab.com/gitlab-org/gitlab-ce/issues/20344#note_14786550
I'm also still working on adding JSON Schema (https://gitlab.com/gitlab-org/gitlab-ce/issues/20673) validations for these APIs. They should all use basically the same schema, which they didn't before, so that's progress!
Does this MR meet the acceptance criteria?
-
CHANGELOG entry added -
Documentation created/updated -
API support added - Tests
-
Added for this feature/bug -
All builds are passing
-
-
Conform by the merge request performance guides -
Conform by the style guides -
Branch has no merge conflicts with master
(if you do - rebase it please) -
Squashed related commits together
What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/20344, https://gitlab.com/gitlab-org/gitlab-ce/issues/21288
Merge request reports
Activity
- Resolved by Douwe Maan
- Resolved by Douwe Maan
- Resolved by Douwe Maan
- Resolved by Douwe Maan
- Resolved by Douwe Maan
Added 1 commit:
- 0958eee1 - Fix MR model spec
Added 1 commit:
- c032fb0a - Fix resolve service specs
Added 1 commit:
- 9f7eaa05 - Add JSON Schema
mentioned in issue #20344 (closed)
@dbalexandre would you take a look at this please?
Reassigned to @dbalexandre
- Resolved by Douwe Maan
- Resolved by Sean McGivern
- Resolved by Sean McGivern
- Resolved by Douwe Maan
- Resolved by Douwe Maan
@smcgivern Looks good
! Just few comments.Reassigned to @smcgivern
Added 1 commit:
- a60aa155 - Simplify conflict file JSON creation
@dbalexandre I've made a couple of changes, can you take a look at the other two?
Reassigned to @dbalexandre
@smcgivern Looks good
Just one comment.Reassigned to @smcgivern
@DouweM do you want to take a look too?
Reassigned to @DouweM
Mentioned in merge request !6374 (merged)
@DouweM Here's the MR with the frontend stuff for this MR. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6374. I'll finish a last one thing then add feature tests for that. Let me know if you want me to merge frontend stuff here.
Can someone take a look at this MR to fix the failing specs? @DouweM
Added 906 commits:
-
a60aa155...791079e2 - 905 commits from branch
master
- bf07030a - Merge branch 'master' into merge-conflicts-editor
-
a60aa155...791079e2 - 905 commits from branch
Added 1 commit:
- 923cf9d1 - We now support resolving conflicts with ambiguous markers
Reassigned to @alfredo1
@alfredo1 can we close this in favour of !6374 (merged)?
@smcgivern Yes please.