diff options
| author | Phil Hughes <me@iamphill.com> | 2016-08-31 15:43:18 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-21 10:07:24 +0100 |
| commit | 5461a5d10ae9179e28b9914e5c567d7eec56c79b (patch) | |
| tree | 6d4c66e35d63ca1fa1a766fb392fe6cba343ee96 /app/views | |
| parent | 6df3dd9d5ed6c16d60f560c906dded888d845953 (diff) | |
| download | gitlab-ce-5461a5d10ae9179e28b9914e5c567d7eec56c79b.tar.gz | |
Pass the full project path for resolve buttons
This fixes an issue that would stop the resolve buttons working when GitLab is installed with a relative URL
Closes #21704
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/discussions/_resolve_all.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/views/discussions/_resolve_all.html.haml b/app/views/discussions/_resolve_all.html.haml index 7a8767ddba0..b56409e4cf4 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), diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 9ec17cf6e76..6e0addd35aa 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -24,9 +24,7 @@ - if note.resolvable? - can_resolve = can?(current_user, :resolve_note, note) - - %resolve-btn{ ":namespace-path" => "'#{note.project.namespace.path}'", - ":project-path" => "'#{note.project.path}'", + %resolve-btn{ ":project-path" => "'#{project_path(note.project)}'", ":discussion-id" => "'#{note.discussion_id}'", ":note-id" => note.id, ":resolved" => note.resolved?, |