diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-24 11:02:27 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-24 11:02:27 +0000 |
| commit | 4028022f56f81f9cbe1227dae53c878f702bd8fa (patch) | |
| tree | d99698bd0aa0bbe481942af5eba688e75244d4fa | |
| parent | 5bd4bee00fd1c5bd0bbccd330bf10fd9edc5e742 (diff) | |
| parent | cc6491ef6405de855b071e128631df6fdb47db8e (diff) | |
| download | gitlab-ce-4028022f56f81f9cbe1227dae53c878f702bd8fa.tar.gz | |
Merge branch 'issue-boards-user-url' into 'master'
Use root_url for issue boards user link
## What does this MR do?
Rather than using `/` as the root path, it now correctly sends the root URL from Rails to prevent errors with installations in subdirectories.
## What are the relevant issue numbers?
Closes #23556
See merge request !7018
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | app/views/projects/boards/components/_card.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1191c6a592c..bee10eb4101 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ Please view this file on the master branch, on stable branches it's out of date. - Add hover to trash icon in notes !7008 (blackst0ne) - Simpler arguments passed to named_route on toggle_award_url helper method - Fix: Backup restore doesn't clear cache - - Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method - Fix documents and comments on Build API `scope` - Refactor email, use setter method instead AR callbacks for email attribute (Semyon Pupkov) @@ -47,6 +46,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Clarify documentation for Runners API (Gennady Trafimenkov) - The instrumentation for Banzai::Renderer has been restored - Change user & group landing page routing from /u/:username to /:username + - Fixed issue boards user link when in subdirectory - Added documentation for .gitattributes files - Move Pipeline Metrics to separate worker - AbstractReferenceFilter caches project_refs on RequestStore when active 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' } } |