From c210ddab9289e29fadc9a5a0462ffbe864af736c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= Date: Fri, 15 Dec 2017 23:24:12 -0500 Subject: 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. --- doc/api/commits.md | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/api') 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' -- cgit v1.2.1 From c927e57466b6c705891f09c95f566259d8e1ec0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= Date: Wed, 20 Dec 2017 10:57:27 -0500 Subject: Updates from last code review: - Apply some refactoring for code reuse - Add file status validation for Files::DeleteService - Write additional specs --- doc/api/commits.md | 2 +- doc/api/repository_files.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/api') diff --git a/doc/api/commits.md b/doc/api/commits.md index 7de08d230dd..c9b72d4a1dd 100644 --- a/doc/api/commits.md +++ b/doc/api/commits.md @@ -84,7 +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 | +| `last_commit_id` | string | no | Last known file commit id. Will be only considered in update, move and delete actions. | ```bash PAYLOAD=$(cat << 'JSON' diff --git a/doc/api/repository_files.md b/doc/api/repository_files.md index c517a38a8ba..a1a0b1b756c 100644 --- a/doc/api/repository_files.md +++ b/doc/api/repository_files.md @@ -151,3 +151,4 @@ Parameters: - `author_email` (optional) - Specify the commit author's email address - `author_name` (optional) - Specify the commit author's name - `commit_message` (required) - Commit message +- `last_commit_id` (optional) - Last known file commit id -- cgit v1.2.1