home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-notes-refresh-relative-url' into 'master'

Browse Source 
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
This commit is contained in:
Stan Hu
2015-07-26 17:17:18 +00:00
parent 4a76cbe219 dfe7807653
commit 8be3d1204e
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -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)
app/assets/javascripts/notes.js.coffee
-1
View File
@@ -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