diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-09 17:53:14 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-09 17:53:14 +0300 |
| commit | 0d41b2dd87accc26390f801f52e60e8d00cf9e2f (patch) | |
| tree | e7733509860c7f29e0e69d38f0c597a5501a4f6f /lib | |
| parent | 0d610270d9634b783137bc6318eff4aa82572a7d (diff) | |
| parent | 8820785c8fe267789a5c6edf7f4fcb196c48b4a8 (diff) | |
Merge branch 'fix-emojis-relative-url' into 'master'
Fix emoji URLs in Markdown when relative_url_root is used
Path/URL helpers (e.g. `asset_url_helper`) already include the relative_url_root, so there is no need to attach it twice.
Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example:
RELATIVE_URL_ROOT=/gitlab rspec
Closes #1728
See merge request !1254
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 |