summaryrefslogtreecommitdiff
path: root/doc/api
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2017-12-15 23:24:12 -0500
committerRubén Dávila <ruben@gitlab.com>2017-12-20 01:24:53 -0500
commitc210ddab9289e29fadc9a5a0462ffbe864af736c (patch)
treef64ad586aba389319be6e07d14b117f0bf048761 /doc/api
parent81331fa77e181d193f444c34443d6ef0c5b01ed6 (diff)
downloadgitlab-ce-c210ddab9289e29fadc9a5a0462ffbe864af736c.tar.gz
Check if file has been modified for each action provided.
When commiting multiple files we're now checking if any of those files has been modified by another commit and we're rejecting the new commit in this case.
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/commits.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/api/commits.md b/doc/api/commits.md
index 5a4a8d888b3..7de08d230dd 100644
--- a/doc/api/commits.md
+++ b/doc/api/commits.md
@@ -84,6 +84,7 @@ POST /projects/:id/repository/commits
| `previous_path` | string | no | Original full path to the file being moved. Ex. `lib/class1.rb` |
| `content` | string | no | File content, required for all except `delete`. Optional for `move` |
| `encoding` | string | no | `text` or `base64`. `text` is default. |
+| `last_commit_id` | string | no | Last known file commit id |
```bash
PAYLOAD=$(cat << 'JSON'