diff options
| author | Frank West <frank.west.iii@gmail.com> | 2016-08-08 03:29:23 +0000 |
|---|---|---|
| committer | Frank West <frank.west.iii@gmail.com> | 2016-08-15 02:34:55 +0000 |
| commit | ade0c2c8922c0838ba85cf69419cbb109453d6b2 (patch) | |
| tree | 34631dfd4d42827c94cb7b4883b2f0127d63964e /CHANGELOG | |
| parent | 30f5b9a5b711b46f1065baf755e413ceced5646b (diff) | |
| download | gitlab-ce-ade0c2c8922c0838ba85cf69419cbb109453d6b2.tar.gz | |
Prevents accidental overwrites of commits from UI
Currently when a user performs an update of a file through the UI and there
has already been a change committed to the file the previous commits will be
overwritten without a check to see if the file has been changed.
This commit uses the last commit sha at the time the user starts editing the
file and compares it with the current sha of the file being edited to ensure
they are the same before committing the file. If the shas do not match we
throw an exception preventing the commit from the commit from occurring.
Fixes #5857
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 6e096b480c0..d424d6aebc6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -108,6 +108,7 @@ v 8.11.0 (unreleased) - Sort folders with submodules in Files view !5521 - Each `File::exists?` replaced to `File::exist?` because of deprecate since ruby version 2.2.0 - Add auto-completition in pipeline (Katarzyna Kobierska Ula Budziszewska) + - Ensure file editing in UI does not overwrite commited changes without warning user v 8.10.5 - Add a data migration to fix some missing timestamps in the members table. !5670 |