Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

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)