Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-08-31 23:16:03 +0300
committerRobert Speicher <rspeicher@gmail.com>2015-08-31 23:16:03 +0300
commit7816b223603ee52cc7b0c40f1f1f36a4b752c477 (patch)
tree19e2568eccdca7c54b396251d11f8cdf9888f5b4 /app/helpers
parent9bb06ae9effab7bc2ae813539f1253038cb6c221 (diff)
Fix context options in `markdown` helper
We need to send `path`, not `requested_path`.
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/gitlab_markdown_helper.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index d7843a70c72..4ccdeff353d 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -48,11 +48,11 @@ module GitlabMarkdownHelper
def markdown(text, context = {})
context.merge!(
- current_user: current_user,
- project: @project,
- project_wiki: @project_wiki,
- ref: @ref,
- requested_path: @path
+ current_user: current_user,
+ path: @path,
+ project: @project,
+ project_wiki: @project_wiki,
+ ref: @ref,
)
Gitlab::Markdown.render(text, context)