From 0ee9f8786d9a2f72bf2f37b6a2ce854d7a00b274 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 27 2016 09:51:24 +0000
Subject: [PATCH 1/2] Replace calls to avatar_url by calls to avatar_url_from_openid


---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index f734e0a..ff716ed 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -244,7 +244,8 @@ def add_issue_comment(session, issue, comment, user, ticketfolder,
                 'issue_id': issue.id,
                 'comment_added': text2markdown(issue_comment.comment),
                 'comment_user': issue_comment.user.user,
-                'avatar_url': avatar_url(issue_comment.user.user, size=16),
+                'avatar_url': avatar_url_from_openid(
+                    issue_comment.user.default_email, size=16),
                 'comment_date': issue_comment.date_created.strftime(
                     '%Y-%m-%d %H:%M:%S'),
             }))
@@ -818,7 +819,8 @@ def add_pull_request_comment(session, request, commit, filename, row,
             'comment_added': text2markdown(pr_comment.comment),
             'comment_user': pr_comment.user.user,
             'comment_id': pr_comment.id,
-            'avatar_url': avatar_url(pr_comment.user.user, size=16),
+            'avatar_url': avatar_url_from_openid(
+                pr_comment.user.default_email, size=16),
             'comment_date': pr_comment.date_created.strftime('%Y-%m-%d %H:%M:%S'),
             'commit_id': commit,
             'filename': filename,
@@ -889,7 +891,8 @@ def edit_comment(session, parent, comment, user,
                 'comment_id': comment.id,
                 'parent_id': comment.parent.id,
                 'comment_editor': user_obj.user,
-                'avatar_url': avatar_url(comment.user.user, size=16),
+                'avatar_url': avatar_url_from_openid(
+                    comment.user.default_email, size=16),
                 'comment_date': comment.edited_on.strftime('%Y-%m-%d %H:%M:%S'),
             }))
 

From 265436b1d11872c2b8736fdd543b6e5aa6515c09 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 27 2016 09:57:50 +0000
Subject: [PATCH 2/2] Fix unit-tests


---

diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index 7ccf118..4664c92 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -233,7 +233,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             'div class="projectinfo m-t-1 m-b-1">\ntest project #1        '
             '</div>', output.data)
         self.assertTrue(
-            '<h2 class="p-b-1">\n      0 Open Issues' in output.data)
+            '<h2>\n      0 Open Issues' in output.data)
 
         # Create issues to play with
         repo = pagure.lib.get_project(self.session, 'test')
@@ -253,21 +253,21 @@ class PagureFlaskIssuestests(tests.Modeltests):
         self.assertEqual(output.status_code, 200)
         self.assertIn('<title>Issues - test - Pagure</title>', output.data)
         self.assertTrue(
-            '<h2 class="p-b-1">\n      1 Open Issues' in output.data)
+            '<h2>\n      1 Open Issues' in output.data)
 
         # Status = closed
         output = self.app.get('/test/issues?status=cloSED')
         self.assertEqual(output.status_code, 200)
         self.assertIn('<title>Issues - test - Pagure</title>', output.data)
         self.assertTrue(
-            '<h2 class="p-b-1">\n      0 Closed Issues' in output.data)
+            '<h2>\n      0 Closed Issues' in output.data)
 
         # Status = fixed
         output = self.app.get('/test/issues?status=fixed')
         self.assertEqual(output.status_code, 200)
         self.assertIn('<title>Issues - test - Pagure</title>', output.data)
         self.assertTrue(
-            '<h2 class="p-b-1">\n      0 Closed Issues' in output.data)
+            '<h2>\n      0 Closed Issues' in output.data)
 
         # Project w/o issue tracker
         repo = pagure.lib.get_project(self.session, 'test')