diff --git a/pagure/lib/model.py b/pagure/lib/model.py index 99ede9b..4eda1d6 100644 --- a/pagure/lib/model.py +++ b/pagure/lib/model.py @@ -288,7 +288,7 @@ class Project(BASE): 'issue_tracker': True, 'project_documentation': True, 'pull_requests': True, - 'Only_assignee_can_close_pull-request': False, + 'Only_assignee_can_merge_pull-request': False, } if self._settings: diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 97a8c77..12f5842 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -434,7 +434,7 @@ def merge_request_pull(repo, requestid, username=None): 403, 'You are not allowed to merge pull-request for this project') - if repo.settings.get('Only_assignee_can_close_pull-request', False): + if repo.settings.get('Only_assignee_can_merge_pull-request', False): if not request.assignee: flask.flash( 'This request must be assigned to be merged', 'error')