27 lines
1.1 KiB
Plaintext
27 lines
1.1 KiB
Plaintext
%h3
|
|
= @updated_by_user.name
|
|
pushed new commits to merge request
|
|
= link_to(@merge_request.to_reference, project_merge_request_url(@merge_request.target_project, @merge_request))
|
|
|
|
- if @existing_commits.any?
|
|
- count = @existing_commits.size
|
|
%ul
|
|
%li
|
|
- if count == 1
|
|
- commit_id = @existing_commits.first[:short_id]
|
|
= link_to(commit_id, project_commit_url(@merge_request.target_project, commit_id))
|
|
- else
|
|
= link_to(project_compare_url(@merge_request.target_project, from: @existing_commits.first[:short_id], to: @existing_commits.last[:short_id])) do
|
|
#{@existing_commits.first[:short_id]}...#{@existing_commits.last[:short_id]}
|
|
= precede ' - ' do
|
|
- commits_text = "#{count} commit".pluralize(count)
|
|
#{commits_text} from branch `#{@merge_request.target_branch}`
|
|
|
|
- if @new_commits.any?
|
|
%ul
|
|
- @new_commits.each do |commit|
|
|
%li
|
|
= link_to(commit[:short_id], project_commit_url(@merge_request.target_project, commit[:short_id]))
|
|
= precede ' - ' do
|
|
#{commit[:title]}
|