summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-04 19:48:44 +0000
committerFatih Acet <acetfatih@gmail.com>2016-11-04 19:48:44 +0000
commitcccc6df5f11ec71bcac310d0917d01f61eace748 (patch)
tree6c21a1ee50f8c167674b180dbb715460da45ce8a /CHANGELOG.md
parentdd5f0762087c1c76394253d660875846d36551d7 (diff)
parent3c4a7f915dfece1ea15185b9f2a1ea5c54e7643f (diff)
downloadgitlab-ce-cccc6df5f11ec71bcac310d0917d01f61eace748.tar.gz
Merge branch 'fixed-width-caret' into 'master'
Add width to caret to rid ourselves of the shift ## What does this MR do? Removes the shift from diff files. ## Are there points in the code the reviewer needs to double check? That it doesn't shift. ## Why was this MR needed? There was a shift in the minimizing of diff files. ## Screenshots (if relevant) ![switcheroo](/uploads/f9734e1d11715e49008e0ca9104d2d4c/switcheroo.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [ ] Added for this feature/bug - [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? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23424 See merge request !6934
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 c055d1f384e..ee0b31356e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ entry.
- Show correct environment log in admin/logs (@duk3luk3 !7191)
- Fix Milestone dropdown not stay selected for `Upcoming` and `No Milestone` option !7117
+- Diff collapse won't shift when collapsing.
- Backups do not fail anymore when using tar on annex and custom_hooks only. !5814
- Adds user project membership expired event to clarify why user was removed (Callum Dryden)
- Trim leading and trailing whitespace on project_path (Linus Thiel)