diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/helpers/gitlab_routing_helper.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/helpers/gitlab_routing_helper.rb')
-rw-r--r-- | app/helpers/gitlab_routing_helper.rb | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb index 7df6bef7914..7ae00a70671 100644 --- a/app/helpers/gitlab_routing_helper.rb +++ b/app/helpers/gitlab_routing_helper.rb @@ -70,6 +70,10 @@ module GitlabRoutingHelper project_commit_url(entity.project, entity.sha, *args) end + def release_url(entity, *args) + project_release_url(entity.project, entity, *args) + end + def preview_markdown_path(parent, *args) return group_preview_markdown_path(parent, *args) if parent.is_a?(Group) @@ -343,18 +347,6 @@ module GitlabRoutingHelper Gitlab::UrlBuilder.wiki_page_url(wiki, page, only_path: true, **options) end - def gitlab_ide_merge_request_path(merge_request) - target_project = merge_request.target_project - source_project = merge_request.source_project - params = {} - - if target_project != source_project - params = { target_project: target_project.full_path } - end - - ide_merge_request_path(source_project.namespace, source_project, merge_request, params) - end - private def snippet_query_params(snippet, *args) |