summaryrefslogtreecommitdiff
path: root/app/models/merge_request_diff.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-08-25 10:59:30 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-08-25 10:59:30 +0300
commitd64c15c5c391e8f49a9f261ba0e59bafb99d97fe (patch)
tree61e1bce257171b542861fbffa1be3321226ee380 /app/models/merge_request_diff.rb
parent03671c30df268c787420cb163beb41d208a3c9e7 (diff)
downloadgitlab-ce-d64c15c5c391e8f49a9f261ba0e59bafb99d97fe.tar.gz
Add code improvements to merge request version feature
* Add MergeRequestDiff#latest? * Remove unnecessary variable assignment Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/merge_request_diff.rb')
-rw-r--r--app/models/merge_request_diff.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 42ab6b620bd..e353bdb24b8 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -79,14 +79,10 @@ class MergeRequestDiff < ActiveRecord::Base
def raw_diffs(options = {})
if options[:ignore_whitespace_change]
@diffs_no_whitespace ||=
- begin
- compare = Gitlab::Git::Compare.new(
- repository.raw_repository,
- safe_start_commit_sha,
- safe_head_commit_sha
- )
- compare.diffs(options)
- end
+ Gitlab::Git::Compare.new(
+ repository.raw_repository,
+ safe_start_commit_sha,
+ safe_head_commit_sha).diffs(options)
else
@raw_diffs ||= {}
@raw_diffs[options] ||= load_diffs(st_diffs, options)
@@ -164,6 +160,10 @@ class MergeRequestDiff < ActiveRecord::Base
end
end
+ def latest?
+ self == merge_request.merge_request_diff
+ end
+
private
def dump_commits(commits)