summaryrefslogtreecommitdiff
path: root/app/helpers/gitlab_routing_helper.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-05-05 09:07:56 +0000
committerRémy Coutable <remy@rymai.me>2017-05-05 09:07:56 +0000
commit8b336ae124408566116c36d198264c9175bcbe9b (patch)
tree1132d797275e108624f008609f1321a679552d62 /app/helpers/gitlab_routing_helper.rb
parent8d059643f93f0d1b99ba153cf7321e905e7d43bb (diff)
parent45e4c665653cd511b0d96119d3973652c43238bb (diff)
downloadgitlab-ce-8b336ae124408566116c36d198264c9175bcbe9b.tar.gz
Merge branch 'adam-separate-slash-commands' into 'master'
Display slash commands outcome when previewing Markdown Closes #21531 See merge request !10054
Diffstat (limited to 'app/helpers/gitlab_routing_helper.rb')
-rw-r--r--app/helpers/gitlab_routing_helper.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb
index 1336c676134..88f9a691a17 100644
--- a/app/helpers/gitlab_routing_helper.rb
+++ b/app/helpers/gitlab_routing_helper.rb
@@ -122,6 +122,10 @@ module GitlabRoutingHelper
namespace_project_snippet_url(entity.project.namespace, entity.project, entity, *args)
end
+ def preview_markdown_path(project, *args)
+ preview_markdown_namespace_project_path(project.namespace, project, *args)
+ end
+
def toggle_subscription_path(entity, *args)
if entity.is_a?(Issue)
toggle_subscription_namespace_project_issue_path(entity.project.namespace, entity.project, entity)