From 29ef46a37537e130d6961a1d17fdbeca8750d92a Mon Sep 17 00:00:00 2001 From: ievgenii vdovenko Date: Thu, 3 Jul 2025 13:47:40 +0200 Subject: [PATCH] feature: adds default value for c.show_merge_strategy for svn --- rhodecode/apps/repository/views/repo_pull_requests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rhodecode/apps/repository/views/repo_pull_requests.py b/rhodecode/apps/repository/views/repo_pull_requests.py index 5da8bfd0..9e37270b 100644 --- a/rhodecode/apps/repository/views/repo_pull_requests.py +++ b/rhodecode/apps/repository/views/repo_pull_requests.py @@ -429,6 +429,7 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView): raise HTTPNotFound() c.shadow_clone_url = PullRequestModel().get_shadow_clone_url(pull_request_at_ver) + c.show_merge_strategy = False if pull_request_at_ver.target_repo.repo_type in ["hg", "git"]: key = "rhodecode_%s_merge_strategy_selector" % pull_request_at_ver.target_repo.repo_type c.show_merge_strategy = self._get_general_setting(pull_request_at_ver.target_repo, key)