summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-16 15:09:17 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-16 15:09:17 -0800
commiteceec9b1c528a4fb05888e0c83e1d58c41f3d047 (patch)
tree962f5a65b080cfbb82f73f3ac70464c5598e8fc8
parent9eef14279f1774110e68107372ef8cc758383168 (diff)
parent5ec803898423645ecf7a58029733c8bc7c5cc4b2 (diff)
downloadgitlab-ce-eceec9b1c528a4fb05888e0c83e1d58c41f3d047.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3aac6f903f4..25da16bf8a9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,7 +10,7 @@ v 7.8.0 (unreleased)
- View note image attachments in new tab when clicked instead of downloading them
- Improve sorting logic in UI and API. Explicitly define what sorting method is used by default
- Allow more variations for commit messages closing issues (Julien Bianchi and Hannes Rosenögger)
- - Fix overflow at sidebar when have several itens
+ - Fix overflow at sidebar when have several items
- Add notes for label changes in issue and merge requests
- Show tags in commit view (Hannes Rosenögger)
- Only count a user's vote once on a merge request or issue (Michael Clarke)