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 | |
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')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -39,7 +39,7 @@ gem "browser" # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 7.1.2' +gem "gitlab_git", '~> 7.1.3' # Ruby/Rack Git Smart-HTTP Server Handler gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack' |