From 3a42df7915f4bf93b3b1c2524be717a14e7113fc Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 14:04:00 +0000
Subject: [PATCH 1/16] Fix showing the status of the pull-request when it's merged/closed


---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index d4e352d..c86d0a8 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -28,7 +28,7 @@
 <div class="header">
     <h3>Title: {{ pull_request.title }}</h3>
     <ul class="buttons">
-  {% if pull_request.status and repo_admin %}
+  {% if pull_request.status == 'Open' and repo_admin %}
       <li>
         <form action="{{ url_for('merge_request_pull', username=username,
             repo=repo.name, requestid=requestid) }}" method="POST">
@@ -43,7 +43,7 @@
           <input type="submit" value="Close" id="cancel_pr" class="button"/>
         </form>
       </li>
-  {% elif pull_request and pull_request.status != 'Open' %}
+  {% elif pull_request.status != 'Open' %}
     <li>
       <span class="error">{{ pull_request.status }}</span>
     </li>

From 896422b7b7fae5c61930f3fa7720101be7d426b1 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 14:13:21 +0000
Subject: [PATCH 2/16] Store in the database who close (merged or closed) the pull-request


---

diff --git a/alembic/versions/abc71fd60fa_add_the_closed_by_column_to_pull_.py b/alembic/versions/abc71fd60fa_add_the_closed_by_column_to_pull_.py
new file mode 100644
index 0000000..17e5ff6
--- /dev/null
+++ b/alembic/versions/abc71fd60fa_add_the_closed_by_column_to_pull_.py
@@ -0,0 +1,34 @@
+"""Add the closed_by column to pull_requests
+
+
+Revision ID: abc71fd60fa
+Revises: 298891e63039
+Create Date: 2015-06-08 16:06:18.017110
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'abc71fd60fa'
+down_revision = '298891e63039'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ''' Add the column merge_status to the table pull_requests.
+    '''
+    op.add_column(
+        'pull_requests',
+        sa.Column(
+            'closed_by_id',
+            sa.Integer,
+            sa.ForeignKey('users.id', onupdate='CASCADE'),
+        )
+    )
+
+
+def downgrade():
+    ''' Remove the column merge_status from the table pull_requests.
+    '''
+    op.drop_column('pull_requests', 'closed_by_id')
diff --git a/pagure/lib/model.py b/pagure/lib/model.py
index ee0203d..9b8e5ec 100644
--- a/pagure/lib/model.py
+++ b/pagure/lib/model.py
@@ -698,6 +698,10 @@ class PullRequest(BASE):
             'status_pull_requests.status', onupdate='CASCADE'),
         default='Open',
         nullable=False)
+    closed_by_id = sa.Column(
+        sa.Integer,
+        sa.ForeignKey('users.id', onupdate='CASCADE'),
+        nullable=False)
 
     date_created = sa.Column(sa.DateTime, nullable=False,
                              default=datetime.datetime.utcnow)
@@ -714,6 +718,8 @@ class PullRequest(BASE):
                     remote_side=[User.id], backref='pull_requests')
     assignee = relation('User', foreign_keys=[assignee_id],
                         remote_side=[User.id], backref='assigned_requests')
+    closed_by = relation('User', foreign_keys=[closed_by_id],
+                         remote_side=[User.id], backref='closed_requests')
 
     def __repr__(self):
         return 'PullRequest(%s, project:%s, user:%s, title:%s)' % (

From 09fbece843a6fbd3295fa41ae44a5d38583df83d Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 14:13:45 +0000
Subject: [PATCH 3/16] Show in the pull-request view who merged the pull-request


---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index c86d0a8..ea85aca 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -45,7 +45,11 @@
       </li>
   {% elif pull_request.status != 'Open' %}
     <li>
-      <span class="error">{{ pull_request.status }}</span>
+      <span class="error">{{ pull_request.status }} by
+        <a href="{{ url_for('view_user', username=pull_request.closed_by.user)}} ">
+          {{ pull_request.closed_by.user if pull_request.closed_by else ''}}
+        </a>
+      </span>
     </li>
   {% endif %}
       <li>

From 9b2c81380387dbddfd54c3a0331700b9d8aee0c9 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 14:14:31 +0000
Subject: [PATCH 4/16] Store in the DB who merged/closed the pull-request


---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 72206f8..2b8d03b 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -1484,6 +1484,7 @@ def close_pull_request(session, request, user, requestfolder, merged=True):
         request.status = 'Merged'
     else:
         request.status = 'Closed'
+    request.close_by_id = user_obj.id
     session.add(request)
     session.flush()
 

From 50644e2c5e6c048573cc9c6edbed0e08f51cf705 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 14:18:52 +0000
Subject: [PATCH 5/16] Fix typo


---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 2b8d03b..3f7c499 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -1484,7 +1484,7 @@ def close_pull_request(session, request, user, requestfolder, merged=True):
         request.status = 'Merged'
     else:
         request.status = 'Closed'
-    request.close_by_id = user_obj.id
+    request.closed_by_id = user_obj.id
     session.add(request)
     session.flush()
 

From c95ba8e35c0192e400a803fb2dbe6c582d538b5d Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 14:19:07 +0000
Subject: [PATCH 6/16] closed_by_id must be nullable otherwise we can't create a pull-request


---

diff --git a/pagure/lib/model.py b/pagure/lib/model.py
index 9b8e5ec..dd58bef 100644
--- a/pagure/lib/model.py
+++ b/pagure/lib/model.py
@@ -701,7 +701,7 @@ class PullRequest(BASE):
     closed_by_id = sa.Column(
         sa.Integer,
         sa.ForeignKey('users.id', onupdate='CASCADE'),
-        nullable=False)
+        nullable=True)
 
     date_created = sa.Column(sa.DateTime, nullable=False,
                              default=datetime.datetime.utcnow)

From ee07f4146c40cd5136910800e25ca8b4ca5335fc Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 14:19:32 +0000
Subject: [PATCH 7/16] Specify who closed the pull-request in the API output


---

diff --git a/pagure/lib/model.py b/pagure/lib/model.py
index dd58bef..8c2a139 100644
--- a/pagure/lib/model.py
+++ b/pagure/lib/model.py
@@ -786,6 +786,8 @@ class PullRequest(BASE):
             'status': self.status,
             'commit_start': self.commit_start,
             'commit_stop': self.commit_stop,
+            'closed_by': self.closed_by.to_json(public=public)
+            if self.closed_by else None,
         }
 
         comments = []

From bab89f77d0f58b6809239bae0f4dadadfbad73ba Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 14:38:35 +0000
Subject: [PATCH 8/16] Another attempt at fixing the unit-tests here


---

diff --git a/tests/test_progit_flask_ui_fork.py b/tests/test_progit_flask_ui_fork.py
index 4f26552..b048367 100644
--- a/tests/test_progit_flask_ui_fork.py
+++ b/tests/test_progit_flask_ui_fork.py
@@ -1332,7 +1332,7 @@ index 0000000..2a552bb
                 '<li class="error">Fork is empty, there are no commits to '
                 'request pulling</li>', output.data)
 
-            output = self.app.get('/fork/foo/test/new_issue')
+            output = self.app.get('/test/new_issue')
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
 

From 2af7f7f89be9e2f24737dc4024d2567e47356a3f Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 14:38:50 +0000
Subject: [PATCH 9/16] Adjust the unit-test for the change in the UI


---

diff --git a/tests/test_progit_flask_ui_fork.py b/tests/test_progit_flask_ui_fork.py
index b048367..72bd7d5 100644
--- a/tests/test_progit_flask_ui_fork.py
+++ b/tests/test_progit_flask_ui_fork.py
@@ -474,7 +474,7 @@ class PagureFlaskForktests(tests.Modeltests):
         self.assertIn(
             '<title>Pull request #1 - test - Pagure</title>', output.data)
         self.assertIn(
-            '<span class="error">Merged</span>', output.data)
+            '<span class="error">Merged by', output.data)
         self.assertIn(
             'title="View file as of 2a552b">View</a>', output.data)
 

From 94a9aa15dbbdd3a9fed0e825d28ec14738cd807c Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 14:39:10 +0000
Subject: [PATCH 10/16] Adjust the unit-tests for the change in the JSON representation of pull-request


---

diff --git a/tests/test_progit_flask_api_fork.py b/tests/test_progit_flask_api_fork.py
index 8bbe951..8f90b0d 100644
--- a/tests/test_progit_flask_api_fork.py
+++ b/tests/test_progit_flask_api_fork.py
@@ -104,6 +104,7 @@ class PagureFlaskApiForktests(tests.Modeltests):
                   "assignee": None,
                   "branch": "master",
                   "branch_from": "master",
+                  "closed_by": None,
                   "comments": [],
                   "commit_start": None,
                   "commit_stop": None,
@@ -220,6 +221,7 @@ class PagureFlaskApiForktests(tests.Modeltests):
               "assignee": None,
               "branch": "master",
               "branch_from": "master",
+              "closed_by": None,
               "comments": [],
               "commit_start": None,
               "commit_stop": None,
diff --git a/tests/test_progit_lib_git.py b/tests/test_progit_lib_git.py
index f69c09e..3b54fd5 100644
--- a/tests/test_progit_lib_git.py
+++ b/tests/test_progit_lib_git.py
@@ -669,7 +669,7 @@ index 0000000..60f7480
 --- /dev/null
 +++ b/456
 @@ -0,0 +1 @@
-+{"status": true, "branch_from": "feature", "uid": "foobar", "commit_stop": null, "title": "test PR", "comments": [], "project": {"description": "test project for ticket", "parent": null, "settings": {"Minimum_score_to_merge_pull-request": -1, "Web-hooks": null, "project_documentation": true, "pull_requests": true, "Enforce_signed-off_commits_in_pull-request": false, "Only_assignee_can_merge_pull-request": false, "issue_tracker": true}, "user": {"fullname": "PY C", "default_email": "bar@pingou.com", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "date_created": null, "id": 1, "name": "test_ticket_repo"}, "assignee": null, "repo_from": {"description": "test project for ticket", "parent": null, "settings": {"Minimum_score_to_merge_pull-request": -1, "Web-hooks": null, "project_documentation": true, "pull_requests": true, "Enforce_signed-off_commits_in_pull-request": false, "Only_assignee_can_merge_pull-request": false, "issue_tracker": true}, "user": {"fullname": "PY C", "default_email": "bar@pingou.com", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "date_created": null, "id": 1, "name": "test_ticket_repo"}, "user": {"fullname": "PY C", "default_email": "bar@pingou.com", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "branch": "master", "date_created": null, "commit_start": null, "id": 1}
++{"status": true, "branch_from": "feature", "uid": "foobar", "commit_stop": null, "title": "test PR", "comments": [], "closed_by": null, "project": {"description": "test project for ticket", "parent": null, "settings": {"Minimum_score_to_merge_pull-request": -1, "Web-hooks": null, "project_documentation": true, "pull_requests": true, "Enforce_signed-off_commits_in_pull-request": false, "Only_assignee_can_merge_pull-request": false, "issue_tracker": true}, "user": {"fullname": "PY C", "default_email": "bar@pingou.com", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "date_created": null, "id": 1, "name": "test_ticket_repo"}, "assignee": null, "repo_from": {"description": "test project for ticket", "parent": null, "settings": {"Minimum_score_to_merge_pull-request": -1, "Web-hooks": null, "project_documentation": true, "pull_requests": true, "Enforce_signed-off_commits_in_pull-request": false, "Only_assignee_can_merge_pull-request": false, "issue_tracker": true}, "user": {"fullname": "PY C", "default_email": "bar@pingou.com", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "date_created": null, "id": 1, "name": "test_ticket_repo"}, "user": {"fullname": "PY C", "default_email": "bar@pingou.com", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "branch": "master", "date_created": null, "commit_start": null, "id": 1}
 \ No newline at end of file
 
 """

From 1c34eaa717e61d86ce822d64dade54cd071c3e0f Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 15:01:06 +0000
Subject: [PATCH 11/16] Let's backward compatible when loading a PR from git


---

diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 59bc866..cd26035 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -493,6 +493,12 @@ def update_request_from_git(
             gitfolder, forkfolder, docfolder, ticketfolder, requestfolder
         )
 
+        status = json_data.get('status')
+        if status == True:
+            status = 'Open'
+        elif status is False:
+            status = 'Merged'
+
         # Create new request
         pagure.lib.new_pull_request(
             session,
@@ -504,7 +510,7 @@ def update_request_from_git(
             user=user.username,
             requestuid=json_data.get('uid'),
             requestid=json_data.get('id'),
-            status=json_data.get('status'),
+            status=status,
             requestfolder=None,
             notify=False,
         )

From fc15df922be04578e1dbf634e7855d4b3388b577 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 15:15:14 +0000
Subject: [PATCH 12/16] Another adjustment to check for true/false


---

diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index cd26035..02383f9 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -494,9 +494,9 @@ def update_request_from_git(
         )
 
         status = json_data.get('status')
-        if status == True:
+        if str(status).lower() == 'true':
             status = 'Open'
-        elif status is False:
+        elif str(status).lower() == 'false':
             status = 'Merged'
 
         # Create new request

From ce0f3fb863cfff3945f27e743ad0755f1a2e6264 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 15:16:16 +0000
Subject: [PATCH 13/16] Another place where the PR's status shouldn't be False


---

diff --git a/tests/test_progit_flask_ui_fork.py b/tests/test_progit_flask_ui_fork.py
index 72bd7d5..cdfec33 100644
--- a/tests/test_progit_flask_ui_fork.py
+++ b/tests/test_progit_flask_ui_fork.py
@@ -1148,7 +1148,8 @@ index 0000000..2a552bb
             # Pull-Request closed
             repo = pagure.lib.get_project(self.session, 'test')
             req = repo.requests[0]
-            req.status = False
+            req.status = 'Closed'
+            req.closed_by_in = 1
             self.session.add(req)
             self.session.commit()
 

From 8dec5eb50c6fdc63cae0df98d840491d70123c63 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 15:17:16 +0000
Subject: [PATCH 14/16] Patch the session in ui.issues as well


---

diff --git a/tests/test_progit_flask_ui_fork.py b/tests/test_progit_flask_ui_fork.py
index cdfec33..38f67b0 100644
--- a/tests/test_progit_flask_ui_fork.py
+++ b/tests/test_progit_flask_ui_fork.py
@@ -43,6 +43,7 @@ class PagureFlaskForktests(tests.Modeltests):
         pagure.ui.filters.SESSION = self.session
         pagure.ui.fork.SESSION = self.session
         pagure.ui.repo.SESSION = self.session
+        pagure.ui.issues.SESSION = self.session
 
         pagure.APP.config['GIT_FOLDER'] = os.path.join(tests.HERE, 'repos')
         pagure.APP.config['FORK_FOLDER'] = os.path.join(tests.HERE, 'forks')

From ff2972879d83ed464565ba7732f1055d680af3f1 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 15:24:21 +0000
Subject: [PATCH 15/16] Default status for a PR is 'Open'


---

diff --git a/tests/test_progit_lib_git.py b/tests/test_progit_lib_git.py
index 3b54fd5..4e9f9e2 100644
--- a/tests/test_progit_lib_git.py
+++ b/tests/test_progit_lib_git.py
@@ -641,7 +641,7 @@ index 458821a..77674a8
             requestfolder=tests.HERE,
             requestuid='foobar',
             requestid=None,
-            status=True,
+            status='Open',
             notify=True
         )
         self.assertEqual(req.id, 1)

From f19a81f1256c72b19719bcfc522235bd5cd11df5 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 15:31:44 +0000
Subject: [PATCH 16/16] And another s/True/Open fix


---

diff --git a/tests/test_progit_lib_git.py b/tests/test_progit_lib_git.py
index 4e9f9e2..b4b7f16 100644
--- a/tests/test_progit_lib_git.py
+++ b/tests/test_progit_lib_git.py
@@ -669,7 +669,7 @@ index 0000000..60f7480
 --- /dev/null
 +++ b/456
 @@ -0,0 +1 @@
-+{"status": true, "branch_from": "feature", "uid": "foobar", "commit_stop": null, "title": "test PR", "comments": [], "closed_by": null, "project": {"description": "test project for ticket", "parent": null, "settings": {"Minimum_score_to_merge_pull-request": -1, "Web-hooks": null, "project_documentation": true, "pull_requests": true, "Enforce_signed-off_commits_in_pull-request": false, "Only_assignee_can_merge_pull-request": false, "issue_tracker": true}, "user": {"fullname": "PY C", "default_email": "bar@pingou.com", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "date_created": null, "id": 1, "name": "test_ticket_repo"}, "assignee": null, "repo_from": {"description": "test project for ticket", "parent": null, "settings": {"Minimum_score_to_merge_pull-request": -1, "Web-hooks": null, "project_documentation": true, "pull_requests": true, "Enforce_signed-off_commits_in_pull-request": false, "Only_assignee_can_merge_pull-request": false, "issue_tracker": true}, "user": {"fullname": "PY C", "default_email": "bar@pingou.com", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "date_created": null, "id": 1, "name": "test_ticket_repo"}, "user": {"fullname": "PY C", "default_email": "bar@pingou.com", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "branch": "master", "date_created": null, "commit_start": null, "id": 1}
++{"status": "Open", "branch_from": "feature", "uid": "foobar", "commit_stop": null, "title": "test PR", "comments": [], "closed_by": null, "project": {"description": "test project for ticket", "parent": null, "settings": {"Minimum_score_to_merge_pull-request": -1, "Web-hooks": null, "project_documentation": true, "pull_requests": true, "Enforce_signed-off_commits_in_pull-request": false, "Only_assignee_can_merge_pull-request": false, "issue_tracker": true}, "user": {"fullname": "PY C", "default_email": "bar@pingou.com", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "date_created": null, "id": 1, "name": "test_ticket_repo"}, "assignee": null, "repo_from": {"description": "test project for ticket", "parent": null, "settings": {"Minimum_score_to_merge_pull-request": -1, "Web-hooks": null, "project_documentation": true, "pull_requests": true, "Enforce_signed-off_commits_in_pull-request": false, "Only_assignee_can_merge_pull-request": false, "issue_tracker": true}, "user": {"fullname": "PY C", "default_email": "bar@pingou.com", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "date_created": null, "id": 1, "name": "test_ticket_repo"}, "user": {"fullname": "PY C", "default_email": "bar@pingou.com", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "branch": "master", "date_created": null, "commit_start": null, "id": 1}
 \ No newline at end of file
 
 """