From 704780b5e0bd01c42ce171ac8ece1cb95e744b81 Mon Sep 17 00:00:00 2001
From: Julen Landa Alustiza <jlanda@fedoraproject.org>
Date: Aug 21 2019 08:49:33 +0000
Subject: templates/repo_pull_request: fix merge button options appearing logic


---

diff --git a/pagure/templates/repo_pull_request.html b/pagure/templates/repo_pull_request.html
index 0929a16..eb20511 100644
--- a/pagure/templates/repo_pull_request.html
+++ b/pagure/templates/repo_pull_request.html
@@ -177,7 +177,7 @@
           </a>
           <div id="merge-alert" class="text-xs-center dropdown-menu dropdown-menu-right p-0">
              <div class="alert text-center mb-0">
-                {% if pull_request.status == 'Open' and g.repo_committer and pull_request.allow_rebase %}
+                {% if pull_request.status == 'Open' and g.repo_committer %}
                 <small id="merge-alert-message"></small>
                 <form action="{{ url_for('ui_ns.merge_request_pull',
                         repo=repo.name,
@@ -194,8 +194,10 @@
                   </div>
                   {% endif %}
                 </form>
+                {% if pull_request.allow_rebase %}
                 <button id="rebase_btn" type="submit"
                   class="btn btn-block my-2">Rebase</button>
+                {% endif %}
               {% else %}
               <small id="merge-alert-message"></small>
               {% endif %}