diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-02-21 22:55:28 +0300 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-02-21 22:55:28 +0300 |
| commit | 2a9eed6620fd57c2a82edf5eab95dade3da250d3 (patch) | |
| tree | d4c33eaaae008510086b0476db9bd4ae32dc298e /CHANGELOG | |
| parent | 83e2a1ca12372279cf7948b4d4b3e8a11c50e428 (diff) | |
| parent | 71e146999c405ab301cd3c3e3aa03b89d46c461e (diff) | |
Merge branch 'master' into rails-4.1.9
Conflicts:
app/views/projects/commits/_commit.html.haml
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue_context.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/show/_context.html.haml
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 92500596656..2c6f87666cb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,10 @@ v 7.9.0 (unreleased) - - Fix broken access control for note attachments (Hannes Rosenögger) + - Move labels/milestones tabs to sidebar + - Improve UI for commits, issues and merge request lists + - Fix commit comments on first line of diff not rendering in Merge Request Discussion view. v 7.8.0 (unreleased) + - Fix access control and protection against XSS for note attachments and other uploads. - Replace highlight.js with rouge-fork rugments (Stefan Tatschner) - Make project search case insensitive (Hannes Rosenögger) - Include issue/mr participants in list of recipients for reassign/close/reopen emails @@ -64,6 +67,8 @@ v 7.8.0 (unreleased) - Remove deprecated Group#owner_id from API - Show projects user contributed to on user page. Show stars near project on user page. - Improve database performance for GitLab + - Add Asana service (Jeremy Benoist) + - Improve project web hooks with extra data v 7.7.2 - Update GitLab Shell to version 2.4.2 that fixes a bug when developers can push to protected branch |