summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-10 18:51:56 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-10 18:51:56 +0300
commit20616c5af541c3d70ca74199fd3f5dc56efee22b (patch)
treefe256503530a8c806433211c2cf43f7673358170 /app
parent7a914e5a8fb5af088afe598d1ceb38d145280700 (diff)
parent0c5ca76dfc17e5aa9aa1d9f46f52915563f959de (diff)
downloadgitlab-ce-20616c5af541c3d70ca74199fd3f5dc56efee22b.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'app')
-rw-r--r--app/helpers/gitlab_markdown_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index c7f769cee64..c112e98508c 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -138,7 +138,7 @@ module GitlabMarkdownHelper
# If we are at doc/api/README.md and the README.md contains relative links like [Users](users.md)
# this takes the request path(doc/api/README.md), and replaces the README.md with users.md so the path looks like doc/api/users.md
# If we are at doc/api and the README.md shown in below the tree view
- # this takes the rquest path(doc/api) and adds users.md so the path looks like doc/api/users.md
+ # this takes the request path(doc/api) and adds users.md so the path looks like doc/api/users.md
def build_nested_path(path, request_path)
return request_path if path == ""
return path unless request_path