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

pull-requests: add merge validation to prevent merges to protected branches.

Browse source
This commit is contained in:
Marcin Kuzminski 2018-08-28 20:24:40 +02:00
parent 16bc6cc415
commit 6458ef9105
6 changed files with 38 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rhodecode/api/utils.py
View file

@ -403,7 +403,7 @@ def resolve_ref_or_error(ref, repo):
ref_hash = ref_hash or _get_ref_hash(repo, ref_type, ref_name)
except (KeyError, ValueError):
raise JSONRPCError(
'The specified {type} `{name}` does not exist'.format(
'The specified value:{type}:`{name}` does not exist, or is not allowed.'.format(
type=ref_type, name=ref_name))
return ':'.join([ref_type, ref_name, ref_hash])
@ -431,7 +431,6 @@ def _get_commit_dict(
}
# TODO: mikhail: Think about moving this function to some library
def _get_ref_hash(repo, type_, name):
vcs_repo = repo.scm_instance()
if type_ == 'branch' and vcs_repo.alias in ('hg', 'git'):