diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2016-10-12 15:34:47 +0200 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2016-10-17 18:09:34 +0200 |
| commit | 317e48193fe5d75d6671c900a765ead719e6b4df (patch) | |
| tree | 9fd025431f5d05c7b0ae4e5bfe7fb31f7bf218b4 /CHANGELOG.md | |
| parent | d4feb781387a843586d5a01740c43f50ce7ad084 (diff) | |
| download | gitlab-ce-317e48193fe5d75d6671c900a765ead719e6b4df.tar.gz | |
Fix the diff in the merge request view when converting a symlink to a regular file.adam-fix-mr-diff-symlink-file-conversion
In this specific case using file_path as a cache key is not enough,
because there are two entries with the same path.
Closes #21610.
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index fd37d9bcde6..015d520db0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -103,6 +103,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Reduce queries needed to find users using their SSH keys when pushing commits - Prevent rendering the link to all when the author has no access (Katarzyna Kobierska Ula Budziszewska) - Fix broken repository 500 errors in project list + - Fix the diff in the merge request view when converting a symlink to a regular file - Fix Pipeline list commit column width should be adjusted - Close todos when accepting merge requests via the API !6486 (tonygambone) - Ability to batch assign issues relating to a merge request to the author. !5725 (jamedjo) |