diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-29 10:32:27 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-29 10:32:27 +0000 |
| commit | 5f3a7587215a4ff25d3fca0e0aded3b76bc9ac57 (patch) | |
| tree | 1d7cbb5767f7b6e8667bb132911e02d779e54bbf /CHANGELOG | |
| parent | 0154338ed81b495b9a8e5f9ba0ef5c218554401f (diff) | |
| parent | fabaeb096fad0307308c9af3b617a5c7a69734e6 (diff) | |
| download | gitlab-ce-5f3a7587215a4ff25d3fca0e0aded3b76bc9ac57.tar.gz | |
Merge branch 'fix-plain-diffs' into 'master'
Remove the email patches link for merge commits
Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches. This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit. Together these changes should prevent the 500 errors described in the issue.
cc @sytse
See merge request !1737
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 04d889456dd..b176e6826cb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ v 7.10.0 (unreleased) - extend the commit calendar to show the actual commits made on a date (Hannes Rosenögger) - Fix a link in the patch update guide - Add a service to support external wikis (Hannes Rosenögger) + - Omit the "email patches" link and fix plain diff view for merge commits - List new commits for newly pushed branch in activity view. - Add sidetiq gem dependency to match EE - Add changelog, license and contribution guide links to project sidebar. @@ -24,6 +25,7 @@ v 7.10.0 (unreleased) - Fix alignment of navbar toggle button (Cody Mize) - Fix checkbox rendering for nested task lists - Identical look of selectboxes in UI + - Upgrade the gitlab_git gem to version 7.1.3 - Move "Import existing repository by URL" option to button. - Improve error message when save profile has error. - Passing the name of pushed ref to CI service (requires GitLab CI 7.9+) |