diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-07-08 22:50:06 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-07-11 09:31:34 +0100 |
| commit | 5266ae87c43a6760600e397257f9791d950dbe15 (patch) | |
| tree | 83e840670b4c772020be590e5934586fe746df6e /app/models/merge_request_diff.rb | |
| parent | e462e122784f40550c53224af5a58b201ed1fd8f (diff) | |
| download | gitlab-ce-5266ae87c43a6760600e397257f9791d950dbe15.tar.gz | |
Support renames in diff_for_path actions
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -rw-r--r-- | app/models/merge_request_diff.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 7e22491d0a3..d54369c3483 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -47,7 +47,7 @@ class MergeRequestDiff < ActiveRecord::Base end else @diffs ||= {} - @diffs[options[:paths]] ||= load_diffs(st_diffs, options) + @diffs[options] ||= load_diffs(st_diffs, options) end end @@ -146,8 +146,9 @@ class MergeRequestDiff < ActiveRecord::Base def load_diffs(raw, options) if raw.respond_to?(:each) if options[:paths] + old_path, new_path = options[:paths] raw = raw.select do |diff| - options[:paths].include?(diff[:new_path]) + old_path == diff[:old_path] && new_path == diff[:new_path] end end |