diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-09-01 13:59:10 +0100 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:34 -0500 |
| commit | 3f71c43e88c56bb5310c8814cd9f95cafb4f53ef (patch) | |
| tree | a2f79497d1aa44c0bbcee6eb5d9f3b18b4f38647 /config | |
| parent | 5c5259335f8bcc4de117c1e36648a269911281fb (diff) | |
| download | gitlab-ce-3f71c43e88c56bb5310c8814cd9f95cafb4f53ef.tar.gz | |
Allow setting content for resolutions
When reading conflicts:
1. Add a `type` field. `text` works as before, and has `sections`;
`text-editor` is a file with ambiguous conflict markers that can only
be resolved in an editor.
2. Add a `content_path` field pointing to a JSON representation of the
file's content for a single file.
3. Hitting `content_path` returns a similar datastructure to the `file`,
but without the `content_path` and `sections` fields, and with a
`content` field containing the full contents of the file (with
conflict markers).
When writing conflicts:
1. Instead of `sections` being at the top level, they are now in a
`files` array. This matches the read format better.
2. The `files` array contains file hashes, each of which must contain:
a. `new_path`
b. `old_path`
c. EITHER `sections` (which works as before) or `content` (with the
full content of the resolved file).
Diffstat (limited to 'config')
| -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 f9d58f5d5b2..cbce9cd47a0 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 |