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

Fix condensed range in MR push comment.

Browse source
This commit is contained in:
Douwe Maan 2015-03-18 16:37:29 +01:00
parent dbd347bfa0
commit ebfc7d052b
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/note.rb
View file

@ -151,7 +151,7 @@ class Note < ActiveRecord::Base
)
end
def create_new_commits_note(merge_request, project, author, new_commits, existing_commits = [])
def create_new_commits_note(merge_request, project, author, new_commits, existing_commits = [], oldrev = nil)
total_count = new_commits.length + existing_commits.length
commits_text = ActionController::Base.helpers.pluralize(total_count, 'commit')
body = "Added #{commits_text}:\n\n"
@ -161,7 +161,11 @@ class Note < ActiveRecord::Base
if existing_commits.length == 1
existing_commits.first.short_id
else
"#{existing_commits.first.short_id}..#{existing_commits.last.short_id}"
if oldrev
"#{Commit.truncate_sha(oldrev)}...#{existing_commits.last.short_id}"
else
"#{existing_commits.first.short_id}..#{existing_commits.last.short_id}"
end
end
commits_text = ActionController::Base.helpers.pluralize(existing_commits.length, 'commit')

2
app/services/merge_requests/refresh_service.rb
View file

@ -89,7 +89,7 @@ module MergeRequests
end
Note.create_new_commits_note(merge_request, merge_request.project,
@current_user, new_commits, existing_commits)
@current_user, new_commits, existing_commits, @oldrev)
end
end