summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-10-18 10:20:29 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-10-18 10:20:29 +0000
commitc9d7ba4d696bfd0198ac75db6e1b2a08b4517f82 (patch)
tree8f53d97a9839e0b062b2e8ec348e219d2cf6fa7f /CHANGELOG.md
parentb1be32203012e5cbc57146e32d82a641d0211dcd (diff)
parent317e48193fe5d75d6671c900a765ead719e6b4df (diff)
downloadgitlab-ce-c9d7ba4d696bfd0198ac75db6e1b2a08b4517f82.tar.gz
Merge branch 'adam-fix-mr-diff-symlink-file-conversion' into 'master'
Fix the diff in the merge request view when converting a symlink to a regular file ## What does this MR do? It fixes a bug described in #21610 ## Why was this MR needed? There was a regression introduced in https://gitlab.com/gitlab-org/gitlab-ce/commit/cd7c2cb6ddd4d9c9f9bdae00c887c0022c121c17 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #21610 See merge request !6828
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4c2555d0b2..90379e011d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -106,6 +106,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)