diff options
| author | Alec Cooper <ahnolds@gmail.com> | 2015-11-12 21:38:26 -0500 |
|---|---|---|
| committer | Alec Cooper <ahnolds@gmail.com> | 2015-11-14 15:00:55 -0500 |
| commit | 4bb99677b1ddee84ab0433efe081de8025e5aa53 (patch) | |
| tree | d6a2771f2c3224228b19a812cdd990d6f5655ffa | |
| parent | aec9f211e534900f602e769dcdd6f69730849f92 (diff) | |
| download | gitlab-ce-4bb99677b1ddee84ab0433efe081de8025e5aa53.tar.gz | |
Relative links in the README file shown on the repository homepage should point
to the default branch, not to master
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/gitlab/markdown/relative_link_filter.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1bd60728e6f..5d22e950914 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -39,6 +39,7 @@ v 8.2.0 (unreleased) - Improve Continuous Integration graphs page - Make color of "Accept Merge Request" button consistent with current build status - Add ignore white space option in merge request diff and commit and compare view + - Relative links from a repositories README.md now link to the default branch v 8.1.4 - Fix bug where manually merged branches in a MR would end up with an empty diff (Stan Hu) 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('/') |