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 /Gemfile.lock | |
| 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 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7da4d3c3583..340e3818654 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,7 +212,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.0) gemojione (~> 2.0) - gitlab_git (7.1.2) + gitlab_git (7.1.3) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -703,7 +703,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.rc2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) - gitlab_git (~> 7.1.2) + gitlab_git (~> 7.1.3) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) |