diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-07-26 17:17:18 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-07-26 17:17:18 +0000 |
| commit | 8be3d1204eabc2db9a18cda01578282b617ceddf (patch) | |
| tree | 2fd18e63fd0d000fa1d9a1220599e4dcacb2057b | |
| parent | 4a76cbe21907b92e53b168f3085c19d00be11f0b (diff) | |
| parent | dfe7807653304f2a42369141925733f3c6515488 (diff) | |
| download | gitlab-ce-8be3d1204eabc2db9a18cda01578282b617ceddf.tar.gz | |
Merge branch 'fix-notes-refresh-relative-url' into 'master'
Fix live notes refresh in relative URL deployments
### What does this MR do?
This MR fixes URLs used for refreshing notes--the relative_url prefix was appended twice
### Why was this MR needed?
In case of `relative_url` installation, opening a page which does refresh notes (i.e. merge request), the page generates lots of 404 errors in the browser console. It turns out that the relative_url is prepended to the link twice.
Supersedes !233
See merge request !1048
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1ca4c7a8480..e198b48e86e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.14.0 (unreleased) + - Fix URL used for refreshing notes if relative_url is present (Bartłomiej Święcki) - Fix Error 500 when browsing projects with no HEAD (Stan Hu) - Fix full screen mode for snippet comments (Daniel Gerhardt) - Fix 404 error in files view after deleting the last file in a repository (Stan Hu) diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index bcff7bcc49e..0021d17d85e 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -10,7 +10,6 @@ class @Notes constructor: (notes_url, note_ids, last_fetched_at, view) -> @notes_url = notes_url - @notes_url = gon.relative_url_root + @notes_url if gon.relative_url_root? @note_ids = note_ids @last_fetched_at = last_fetched_at @view = view |