diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-09-06 19:42:39 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-09-06 19:46:10 +0300 |
| commit | 8820785c8fe267789a5c6edf7f4fcb196c48b4a8 (patch) | |
| tree | a22f1cc95905a3f8c8a57781dca25a2f86e3a69d /lib | |
| parent | 50f76ae0eae29f7362702da274055f76a350ee6f (diff) | |
Fix emoji URLs in Markdown when relative_url_root is used
Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example:
RELATIVE_URL_ROOT=/gitlab rspec
Closes #1728
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/markdown.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index 097caf67a65..ae5f2544691 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -77,7 +77,7 @@ module Gitlab pipeline: options[:pipeline], # EmojiFilter - asset_root: Gitlab.config.gitlab.url, + asset_root: Gitlab.config.gitlab.base_url, asset_host: Gitlab::Application.config.asset_host, # TableOfContentsFilter |