engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature: adds default value for c.show_merge_strategy for svn

Browse source
This commit is contained in:
ievgenii vdovenko 2025-07-03 13:47:40 +02:00
parent bc4d85fcdb
commit 29ef46a375
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rhodecode/apps/repository/views/repo_pull_requests.py
View file

@ -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)