2015-03-17 08:55:39 -04:00
|
|
|
%h3 #{@author.name} #{@action_name} #{@ref_type} #{@ref_name} at #{link_to @project.name_with_namespace, namespace_project_url(@project.namespace, @project)}
|
2013-12-17 08:30:15 -05:00
|
|
|
|
2015-03-17 08:55:39 -04:00
|
|
|
- if @compare
|
|
|
|
- if @reverse_compare
|
|
|
|
%p
|
|
|
|
%strong WARNING:
|
|
|
|
The push did not contain any new commits, but force pushed to delete the commits and changes below.
|
2015-02-25 09:12:19 -05:00
|
|
|
|
2015-03-17 08:55:39 -04:00
|
|
|
%h4
|
|
|
|
= @reverse_compare ? "Deleted commits:" : "Commits:"
|
2013-12-17 08:30:15 -05:00
|
|
|
|
2015-03-17 08:55:39 -04:00
|
|
|
%ul
|
|
|
|
- @commits.each do |commit|
|
|
|
|
%li
|
|
|
|
%strong #{link_to commit.short_id, namespace_project_commit_url(@project.namespace, @project, commit)}
|
|
|
|
%div
|
|
|
|
%span by #{commit.author_name}
|
|
|
|
%i at #{commit.committed_date.strftime("%Y-%m-%dT%H:%M:%SZ")}
|
|
|
|
%pre.commit-message
|
|
|
|
= commit.safe_message
|
2013-12-17 08:30:15 -05:00
|
|
|
|
2015-03-17 08:55:39 -04:00
|
|
|
%h4 #{pluralize @diffs.count, "changed file"}:
|
2015-02-20 11:55:23 -05:00
|
|
|
|
2015-03-17 08:55:39 -04:00
|
|
|
%ul
|
|
|
|
- @diffs.each_with_index do |diff, i|
|
|
|
|
%li.file-stats
|
|
|
|
%a{href: "#{@target_url if @disable_diffs}#diff-#{i}" }
|
|
|
|
- if diff.deleted_file
|
|
|
|
%span.deleted-file
|
|
|
|
−
|
|
|
|
= diff.old_path
|
|
|
|
- elsif diff.renamed_file
|
2015-02-20 11:55:23 -05:00
|
|
|
= diff.old_path
|
2015-03-17 08:55:39 -04:00
|
|
|
→
|
2015-02-20 11:55:23 -05:00
|
|
|
= diff.new_path
|
2015-03-17 08:55:39 -04:00
|
|
|
- elsif diff.new_file
|
|
|
|
%span.new-file
|
|
|
|
+
|
|
|
|
= diff.new_path
|
|
|
|
- else
|
2015-02-25 08:29:49 -05:00
|
|
|
= diff.new_path
|
2014-02-12 05:56:13 -05:00
|
|
|
|
2015-03-17 08:55:39 -04:00
|
|
|
- unless @disable_diffs
|
|
|
|
%h4 Changes:
|
|
|
|
- @diffs.each_with_index do |diff, i|
|
|
|
|
%li{id: "diff-#{i}"}
|
|
|
|
%a{href: @target_url + "#diff-#{i}"}
|
|
|
|
- if diff.deleted_file
|
|
|
|
%strong
|
|
|
|
= diff.old_path
|
|
|
|
deleted
|
|
|
|
- elsif diff.renamed_file
|
|
|
|
%strong
|
|
|
|
= diff.old_path
|
|
|
|
→
|
|
|
|
%strong
|
|
|
|
= diff.new_path
|
|
|
|
- else
|
|
|
|
%strong
|
|
|
|
= diff.new_path
|
|
|
|
%hr
|
2015-03-31 06:30:09 -04:00
|
|
|
= color_email_diff(diff.diff)
|
2015-03-17 08:55:39 -04:00
|
|
|
%br
|
|
|
|
|
|
|
|
- if @compare.timeout
|
|
|
|
%h5 Huge diff. To prevent performance issues changes are hidden
|