From 4f6636d503c12ac633e1b0d991eb772d39667466 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 17 2018 14:22:32 +0000
Subject: Fix couple of places where fullname is required while it's not


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 0cdf849..bad6f01 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -1297,8 +1297,9 @@ def merge_pull_request(
             else:
                 tree = new_repo.index.write_tree()
                 user_obj = pagure.lib.get_user(session, username)
+                username = user_obj.fullname or user_obj.user
                 author = pygit2.Signature(
-                    user_obj.fullname.encode('utf-8'),
+                    username.encode('utf-8'),
                     user_obj.default_email.encode('utf-8'))
                 commit = new_repo.create_commit(
                     'refs/heads/%s' % request.branch,
@@ -1343,8 +1344,9 @@ def merge_pull_request(
             head = new_repo.lookup_reference('HEAD').get_object()
             _log.info('  Basing on: %s - %s', head.hex, repo_commit.oid.hex)
             user_obj = pagure.lib.get_user(session, username)
+            username = user_obj.fullname or user_obj.user
             author = pygit2.Signature(
-                user_obj.fullname.encode('utf-8'),
+                username.encode('utf-8'),
                 user_obj.default_email.encode('utf-8'))
             commit = new_repo.create_commit(
                 'refs/heads/%s' % request.branch,
diff --git a/pagure/templates/edit_file.html b/pagure/templates/edit_file.html
index b00d426..89c201f 100644
--- a/pagure/templates/edit_file.html
+++ b/pagure/templates/edit_file.html
@@ -64,7 +64,7 @@
             {% endfor %}
           </select>
           {{ user.default_email | avatar(16) | safe }}
-          {{ user.fullname }}
+          {{ user.fullname or user.user }}
         </div>
       </fieldset>
       <fieldset class="form-group">
diff --git a/pagure/templates/forks.html b/pagure/templates/forks.html
index d4aa18b..7e35b51 100644
--- a/pagure/templates/forks.html
+++ b/pagure/templates/forks.html
@@ -26,7 +26,7 @@
             <span>
               <a href="{{ url_for('ui_ns.view_user', username=fork.user.user)}}">
                 {{ fork.user.default_email | avatar(20) | safe }}
-                {{ fork.user.fullname }}
+                {{ fork.user.fullname or fork.user.user }}
               </a> forked this project
             </span>
             <span class="commitdate" data-toggle="tooltip" title="{{
diff --git a/pagure/templates/user_list.html b/pagure/templates/user_list.html
index 547efa4..cf3af3e 100644
--- a/pagure/templates/user_list.html
+++ b/pagure/templates/user_list.html
@@ -55,7 +55,7 @@
             user.default_email | avatar_url(60) |safe }}" width=60 height=60 />
           <a class="project_link logo_link" href="{{
                 url_for('ui_ns.view_user', username=user.user)}}">
-            <div class="repo_name"><strong>{{ user.fullname }}</strong></div>
+            <div class="repo_name"><strong>{{ user.fullname or user.user }}</strong></div>
           </a>
           <div class="repo_desc">
             <small>{{ user.user }} joined <span title="{{