summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-09-06 22:48:00 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-09-06 22:48:00 -0700
commit805d408f0fcacbf07b60f1b002f39045bf7ce364 (patch)
tree977efaca1af844ee28cd8fd7deeaab0ba7cab7f4
parent0eb8a0398197a4a586d83e4e18e7e070f547243f (diff)
parent8fdeb43c36767fc10a0298598fd7452fa609faee (diff)
downloadgitlab-ce-805d408f0fcacbf07b60f1b002f39045bf7ce364.tar.gz
Merge pull request #1397 from tsigo/fix_markdown_help
Fix Markdown help page
-rw-r--r--app/views/help/markdown.html.haml13
1 files changed, 6 insertions, 7 deletions
diff --git a/app/views/help/markdown.html.haml b/app/views/help/markdown.html.haml
index 15ad4a5b06b..2086b08c890 100644
--- a/app/views/help/markdown.html.haml
+++ b/app/views/help/markdown.html.haml
@@ -88,14 +88,13 @@
for commits
-# this example will only be shown if the user has a project with at least one issue
- - if project = current_user.projects.first
- - if issue = project.issues.first
- %p For example in your #{link_to project.name, project_path(project)} project something like
+ - if @project = current_user.projects.first
+ - if issue = @project.issues.first
+ %p For example in your #{link_to @project.name, project_path(@project)} project, writing:
%pre= "This is related to ##{issue.id}. @#{current_user.name} is working on solving it."
- %p becomes
- = markdown "This is related to ##{issue.id}. @#{current_user.name} is working on solving it."
-
-
+ %p becomes:
+ %pre= gfm "This is related to ##{issue.id}. @#{current_user.name} is working on solving it."
+ - @project = nil # Prevent this from bubbling up to page title
.span4.right
.alert.alert-info