diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-26 13:44:51 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-07-26 13:44:51 +0100 |
| commit | 6537a4a8feac08031b3be2133f6756afb3310254 (patch) | |
| tree | df2996b3371cf34ea7721c7017a2e38e4c05ebd8 /app/views/projects/notes | |
| parent | c926cdfa4fbe00be7a7a447b3f23059fda7d7f3c (diff) | |
| download | gitlab-ce-6537a4a8feac08031b3be2133f6756afb3310254.tar.gz | |
Correctly resolves/unresolves discussions
Diffstat (limited to 'app/views/projects/notes')
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 0fce8d06b5f..c90be872ff4 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -24,13 +24,14 @@ - if note.resolvable? - if can?(current_user, :resolve_note, note) - %resolve-btn{ ":namespace" => "'#{note.project.namespace.path}/#{note.project.path}'", + %resolve-btn{ ":namespace-path" => "'#{note.project.namespace.path}'", + ":project-path" => "'#{note.project.path}'", ":discussion-id" => "'#{note.discussion_id}'", ":note-id" => note.id, ":resolved" => note.resolved?, "inline-template" => true, "v-ref:note_#{note.id}" => true } - + .note-action-button = icon("spin spinner", "v-show" => "loading") %button.line-resolve-btn{ type: "button", |