From c2de90a1399e1a529b6694a182b9f0a8a0389a14 Mon Sep 17 00:00:00 2001
From: Samyak Jain <samyak.jn11@gmail.com>
Date: Jan 25 2024 13:07:49 +0000
Subject: Enable collaborators to merge pull requests


Co-authored-by: FeRD (Frank Dana) <ferdnyc@gmail.com>

---

diff --git a/pagure/templates/repo_pull_request.html b/pagure/templates/repo_pull_request.html
index 9fcd1e5..18ce35e 100644
--- a/pagure/templates/repo_pull_request.html
+++ b/pagure/templates/repo_pull_request.html
@@ -170,7 +170,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 g.repo_committer %}
+                  {% if g.authenticated and (g.repo_committer or g.fas_user.username in g.repo.collaborators) %}
                     <small id="merge-alert-message"></small>
                     <form action="{{ url_for('ui_ns.merge_request_pull',
                         repo=repo.name,