From 4d7c9617a6f90e7d463d7a3e42edc24509d92977 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 13 2016 14:26:26 +0000
Subject: Adjust the wording when showing a merge commit


Instead of saying that the merge was authored and committed by the
person who did the merge, we now say that the merge was `Merged` and
committed by the person who did the merge.
It is a little redundant, but since we include the diff of the merge on
the page some people find it confusing as it could be interpreted as the
person who merged did all the work (while they only did the merge).

Fixes https://pagure.io/pagure/issue/1650

---

diff --git a/pagure/templates/commit.html b/pagure/templates/commit.html
index 5ce976f..b52b680 100644
--- a/pagure/templates/commit.html
+++ b/pagure/templates/commit.html
@@ -58,13 +58,21 @@
   <h5 class="text-muted">
     {% if commit.author| author2user == commit.committer| author2user %}
       <a href="#" id="diff_list_link">{{ diff|count}} file{{'s' if diff|count > 1 }}</a>
-      Authored and Committed by {{ commit.author | author2user |safe }}
+      {% if commit.parents | length == 1 %}
+        Authored and Committed by {{ commit.author | author2user |safe }}
+      {% else %}
+        Merged and Committed by {{ commit.author | author2user |safe }}
+      {% endif %}
       <span data-toggle="tooltip" title="{{ commit.commit_time | format_ts }}">
         {{ commit.commit_time | humanize }}
       </span>
     {% else %}
       <a href="#" id="diff_list_link">{{ diff|count}} file{{'s' if diff|count > 1 }}</a>
-      Authored by {{ commit.author | author2user |safe }}
+      {% if commit.parents | length == 1 %}
+        Authored by {{ commit.author | author2user |safe }}
+      {% else %}
+        Merged by {{ commit.author | author2user |safe }}
+      {% endif %}
       <span data-toggle="tooltip" title="{{ commit.commit_time | format_ts }}">
         {{ commit.commit_time | humanize }}
       </span>,