diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-24 15:59:57 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-24 15:59:57 +0300 |
| commit | 13aec95264541b274d5ed9b828b44860cde93dec (patch) | |
| tree | 8ce65f79e5bf482ec710584083dec511de0c6876 | |
| parent | 53f2130e63b2d20a9c3f6f709f38b70cb27a63ab (diff) | |
| download | gitlab-ce-13aec95264541b274d5ed9b828b44860cde93dec.tar.gz | |
Improve diff and bump gitlab_git revision
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | lib/gitlab/diff/parser.rb | 2 |
3 files changed, 5 insertions, 4 deletions
@@ -31,7 +31,8 @@ gem 'omniauth-shibboleth' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 6.0', git: 'https://gitlab.com/gitlab-org/gitlab_git.git', ref: 'c405e4cf147fc5f7b9eae8aabaf3bee695eb2832' +# gem "gitlab_git", '~> 6.0', path: '../../gitlab_git' +gem "gitlab_git", '~> 6.0', git: 'https://gitlab.com/gitlab-org/gitlab_git.git', ref: 'fab781735c1ab2a8f1dc2fda33b169af99ec7e2e' # Ruby/Rack Git Smart-HTTP Server Handler gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' diff --git a/Gemfile.lock b/Gemfile.lock index 21a55ad6562..b9da7e60a2b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://gitlab.com/gitlab-org/gitlab_git.git - revision: c405e4cf147fc5f7b9eae8aabaf3bee695eb2832 - ref: c405e4cf147fc5f7b9eae8aabaf3bee695eb2832 + revision: fab781735c1ab2a8f1dc2fda33b169af99ec7e2e + ref: fab781735c1ab2a8f1dc2fda33b169af99ec7e2e specs: gitlab_git (6.3.0) activesupport (~> 4.0) diff --git a/lib/gitlab/diff/parser.rb b/lib/gitlab/diff/parser.rb index 9d6309954a4..447aecb9450 100644 --- a/lib/gitlab/diff/parser.rb +++ b/lib/gitlab/diff/parser.rb @@ -13,7 +13,7 @@ module Gitlab lines_arr = ::Gitlab::InlineDiff.processing lines - lines_arr.each do |line| + lines_arr.drop(4).each do |line| raw_line = line.dup next if filename?(line) |