From edf6be86a18b7ed676d3123336f742bd327f79c3 Mon Sep 17 00:00:00 2001 From: ievgenii vdovenko Date: Wed, 25 Jun 2025 10:52:12 +0200 Subject: [PATCH] feature: adds handling CE and EE versions --- rhodecode/model/pull_request.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py index 54443e66..71156d36 100644 --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -33,6 +33,8 @@ import collections import dataclasses as dataclasses from copy import deepcopy +from pyramid.threadlocal import get_current_registry + from rhodecode.lib.pyramid_utils import get_current_request from rhodecode.lib.vcs.nodes import FileNode @@ -2227,7 +2229,11 @@ class PullRequestModel(BaseModel): if repo_type not in ["hg", "git"]: return False - if pull_request.settings and "close_branch_before_merging" in pull_request.settings: + registry = get_current_registry() + is_enterprise = registry.settings.get("rhodecode.edition_id") == "EE" + + if is_enterprise and pull_request.settings and "close_branch_before_merging" in pull_request.settings: + # this feature is available only for the EE edition return pull_request.settings["close_branch_before_merging"] key = "rhodecode_{}_close_branch_before_merging".format(repo_type)