diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-09 16:58:59 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-09 16:58:59 +0000 |
| commit | a44aec8a884eab9f48af582798b0fb153c27f468 (patch) | |
| tree | f5cda5c63a524185218de506c6267de4781d4c9e /app/views/projects/notes/_note.html.haml | |
| parent | 534f7f51d53460dea5d6acca5484a6885e2308b7 (diff) | |
| parent | 88fb39c229ff6569b85417e6c63b87a77f97d667 (diff) | |
| download | gitlab-ce-a44aec8a884eab9f48af582798b0fb153c27f468.tar.gz | |
Merge branch 'diff-notes-refactor' into 'master'
Refactored diff notes Vue app
See merge request !9065
Diffstat (limited to 'app/views/projects/notes/_note.html.haml')
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 4b1da9c73e5..e58de9f0e18 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -30,8 +30,7 @@ - if note.resolvable? - can_resolve = can?(current_user, :resolve_note, note) - %resolve-btn{ "project-path" => "#{project_path(note.project)}", - "discussion-id" => "#{note.discussion_id}", + %resolve-btn{ "discussion-id" => "#{note.discussion_id}", ":note-id" => note.id, ":resolved" => note.resolved?, ":can-resolve" => can_resolve, |