diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-24 14:54:32 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-24 14:54:39 +0100 |
| commit | 0283fff5914f74d9435ab2097b2770dfdf635941 (patch) | |
| tree | 8bcf91cb5639d3d06a15cabb1d08e408b4ba9d43 /CHANGELOG | |
| parent | aba12515942d588f1a0aa0b32cc16837e5d04fef (diff) | |
| parent | 7561b1c2a486ae57e9fbebadadbe1269bfdba6a0 (diff) | |
| download | gitlab-ce-0283fff5914f74d9435ab2097b2770dfdf635941.tar.gz | |
Merge branch 'master' into extend_markdown_upload
# Conflicts:
# app/views/projects/issues/_form.html.haml
# app/views/projects/merge_requests/_form.html.haml
# app/views/projects/merge_requests/_new_submit.html.haml
# app/views/projects/milestones/_form.html.haml
# app/views/projects/notes/_form.html.haml
# app/views/projects/wikis/_form.html.haml
# config/routes.rb
# spec/controllers/projects_controller_spec.rb
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3b94d18ccd2..5c93903e98f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,13 @@ +Please view this file on the master branch, on stable branches it's out of date. + v 7.9.0 (unreleased) - Move labels/milestones tabs to sidebar + - Upgrade Rails gem to version 4.1.9. + - Improve error messages for file edit failures - 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) +v 7.8.0 - Fix access control and protection against XSS for note attachments and other uploads. - Fix broken access control for note attachments (Hannes Rosenögger) - Generalize image upload in drag and drop in markdown to all files (Hannes Rosenögger) |