summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-24 11:02:27 +0000
committerRémy Coutable <remy@rymai.me>2016-10-25 15:06:16 +0200
commitf602a43b9009a566a01c0b2de3cd72a1069f6a4c (patch)
tree174a8d5ecab2e9c4c9ae4e2ca9ce6e11ad18a878
parentde16bab092d0410ab0d49e783a125d3ec699ac10 (diff)
downloadgitlab-ce-f602a43b9009a566a01c0b2de3cd72a1069f6a4c.tar.gz
Merge branch 'issue-boards-user-url' into 'master'
Use root_url for issue boards user link Rather than using `/` as the root path, it now correctly sends the root URL from Rails to prevent errors with installations in subdirectories. Closes #23556 See merge request !7018 Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/views/projects/boards/components/_card.html.haml2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf8807cc457..d4806fe5fc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Please view this file on the master branch, on stable branches it's out of date.
- Fix hidden pipeline graph on commit and MR page. !6895
- Fix Cycle analytics not showing correct data when filtering by date. !6906
- Ensure custom provider tab labels don't break layout. !6993
+ - Fix issue boards user link when in subdirectory. !7018
## 8.13.0 (2016-10-22)
diff --git a/app/views/projects/boards/components/_card.html.haml b/app/views/projects/boards/components/_card.html.haml
index d8f16022407..c6d718a1cd1 100644
--- a/app/views/projects/boards/components/_card.html.haml
+++ b/app/views/projects/boards/components/_card.html.haml
@@ -26,7 +26,7 @@
":title" => "label.description",
data: { container: 'body' } }
{{ label.title }}
- %a.has-tooltip{ ":href" => "'/' + issue.assignee.username",
+ %a.has-tooltip{ ":href" => "'#{root_path}' + issue.assignee.username",
":title" => "'Assigned to ' + issue.assignee.name",
"v-if" => "issue.assignee",
data: { container: 'body' } }