Commit 9c629a1ebc642bfeec9f8cc7379613b1acf7817b
1 parent
2d31a9f3
Exists in
master
and in
4 other branches
Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare
Showing
3 changed files
with
4 additions
and
4 deletions
Show diff stats
Gemfile
| ... | ... | @@ -23,7 +23,7 @@ gem 'omniauth-github' |
| 23 | 23 | |
| 24 | 24 | # Extracting information from a git repository |
| 25 | 25 | # Provide access to Gitlab::Git library |
| 26 | -gem "gitlab_git", '2.1.1' | |
| 26 | +gem "gitlab_git", '2.2.0' | |
| 27 | 27 | |
| 28 | 28 | # Ruby/Rack Git Smart-HTTP Server Handler |
| 29 | 29 | gem 'gitlab-grack', '~> 1.0.1', require: 'grack' | ... | ... |
Gemfile.lock
| ... | ... | @@ -179,7 +179,7 @@ GEM |
| 179 | 179 | gitlab-pygments.rb (0.3.2) |
| 180 | 180 | posix-spawn (~> 0.3.6) |
| 181 | 181 | yajl-ruby (~> 1.1.0) |
| 182 | - gitlab_git (2.1.1) | |
| 182 | + gitlab_git (2.2.0) | |
| 183 | 183 | activesupport (~> 3.2.13) |
| 184 | 184 | github-linguist (~> 2.3.4) |
| 185 | 185 | gitlab-grit (~> 2.6.0) |
| ... | ... | @@ -572,7 +572,7 @@ DEPENDENCIES |
| 572 | 572 | gitlab-gollum-lib (~> 1.0.1) |
| 573 | 573 | gitlab-grack (~> 1.0.1) |
| 574 | 574 | gitlab-pygments.rb (~> 0.3.2) |
| 575 | - gitlab_git (= 2.1.1) | |
| 575 | + gitlab_git (= 2.2.0) | |
| 576 | 576 | gitlab_meta (= 6.0) |
| 577 | 577 | gitlab_omniauth-ldap (= 1.0.3) |
| 578 | 578 | gon | ... | ... |
app/controllers/projects/compare_controller.rb
| ... | ... | @@ -8,7 +8,7 @@ class Projects::CompareController < Projects::ApplicationController |
| 8 | 8 | end |
| 9 | 9 | |
| 10 | 10 | def show |
| 11 | - compare = Gitlab::Git::Compare.new(project.repository, params[:from], params[:to]) | |
| 11 | + compare = Gitlab::Git::Compare.new(@repository.raw_repository, params[:from], params[:to]) | |
| 12 | 12 | |
| 13 | 13 | @commits = compare.commits |
| 14 | 14 | @commit = compare.commit | ... | ... |