diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-09-26 23:00:55 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-09-26 23:00:55 +0000 |
| commit | ab496d82ecd1cc675d10fc30a3af279ad4ab1edf (patch) | |
| tree | 7493ab449c52ea121e24008f128b72abd336a4be /app/views/discussions | |
| parent | 045836c48d3558a1ff67fc6399d77b708e0084fb (diff) | |
| parent | a83262fffa526350fee32d7197309e5f095bd7ba (diff) | |
| download | gitlab-ce-ab496d82ecd1cc675d10fc30a3af279ad4ab1edf.tar.gz | |
Merge branch 'resolve-buttons-path' into 'master'
Pass the full project path for resolve buttons
## What does this MR do?
The full project path is passed from the HTML into the JS rather than the resolve button JS generating the URL based on the the namespaces.
@smcgivern @stanhu Do we have anyway of adding tests for installs with relative URLs?
## What are the relevant issue numbers?
Closes #21704
See merge request !6129
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_resolve_all.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/discussions/_resolve_all.html.haml b/app/views/discussions/_resolve_all.html.haml index 9c2ae8faaab..c77889a4d38 100644 --- a/app/views/discussions/_resolve_all.html.haml +++ b/app/views/discussions/_resolve_all.html.haml @@ -1,6 +1,5 @@ - if discussion.for_merge_request? - %resolve-discussion-btn{ ":namespace-path" => "'#{discussion.project.namespace.path}'", - ":project-path" => "'#{discussion.project.path}'", + %resolve-discussion-btn{ ":project-path" => "'#{project_path(discussion.project)}'", ":discussion-id" => "'#{discussion.id}'", ":merge-request-id" => discussion.noteable.iid, ":can-resolve" => discussion.can_resolve?(current_user), |