diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-09 14:53:14 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-09 14:53:14 +0000 |
| commit | 0d41b2dd87accc26390f801f52e60e8d00cf9e2f (patch) | |
| tree | e7733509860c7f29e0e69d38f0c597a5501a4f6f /CHANGELOG | |
| parent | 0d610270d9634b783137bc6318eff4aa82572a7d (diff) | |
| parent | 8820785c8fe267789a5c6edf7f4fcb196c48b4a8 (diff) | |
| download | gitlab-ce-0d41b2dd87accc26390f801f52e60e8d00cf9e2f.tar.gz | |
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 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3a1cbe4bc56..32f063fa751 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.0.0 (unreleased) - Fix URL construction for merge requests, issues, notes, and commits for relative URL config (Stan Hu) + - Fix emoji URLs in Markdown when relative_url_root is used (Stan Hu) - Omit filename in Content-Disposition header in raw file download to avoid RFC 6266 encoding issues (Stan HU) - Fix broken Wiki Page History (Stan Hu) - Prevent anchors from being hidden by header (Stan Hu) |