diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-16 10:18:40 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-16 10:18:40 +0100 |
| commit | 86ce64f0531d70daaed16acbbd7ff10614b6c31e (patch) | |
| tree | 0613e408f37afa0006a5d7233880e7fc1e22c93e /lib | |
| parent | a43a218c98ba826ac9d8e0aa764d5a9341a6f64d (diff) | |
| parent | 5be2191b1a3673659682ce47dfb601d7d36d852c (diff) | |
| download | gitlab-ce-86ce64f0531d70daaed16acbbd7ff10614b6c31e.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/markdown/relative_link_filter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/markdown/relative_link_filter.rb b/lib/gitlab/markdown/relative_link_filter.rb index 6ee3d1ce039..632be4d7542 100644 --- a/lib/gitlab/markdown/relative_link_filter.rb +++ b/lib/gitlab/markdown/relative_link_filter.rb @@ -51,7 +51,7 @@ module Gitlab relative_url_root, context[:project].path_with_namespace, path_type(file_path), - ref || 'master', # assume that if no ref exists we can point to master + ref || context[:project].default_branch, # if no ref exists, point to the default branch file_path ].compact.join('/').squeeze('/').chomp('/') |