kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Statisfy Robertcop and Seancop

Browse source
This commit is contained in:
Douwe Maan 2017-04-11 10:51:48 -05:00
parent 4f8c36c03c
commit 543dcdacc2
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/models/merge_request_diff.rb
View file

@ -135,15 +135,9 @@ class MergeRequestDiff < ActiveRecord::Base
end
def diff_refs=(new_diff_refs)
if new_diff_refs
self.base_commit_sha = new_diff_refs.base_sha
self.start_commit_sha = new_diff_refs.start_sha
self.head_commit_sha = new_diff_refs.head_sha
else
self.base_commit_sha = nil
self.start_commit_sha = nil
self.head_commit_sha = nil
end
self.base_commit_sha = new_diff_refs&.base_sha
self.start_commit_sha = new_diff_refs&.start_sha
self.head_commit_sha = new_diff_refs&.head_sha
end
def diff_refs

2
app/views/projects/merge_requests/show/_versions.html.haml
View file

@ -81,7 +81,7 @@
- if @start_sha
Comments are disabled because you're comparing two versions of this merge request.
- else
Discussions on this old version of the merge request are displayed but comment creation is disabled.
Discussions on this version of the merge request are displayed but comment creation is disabled.
.pull-right
= link_to 'Show latest version', diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-sm'