diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-21 10:17:27 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-21 10:19:47 +0100 |
| commit | a83262fffa526350fee32d7197309e5f095bd7ba (patch) | |
| tree | df1fd666a5e740cbf8acf6d034be923dc0e03a9f | |
| parent | 1f49b99a5cb56317cd7157dfa0f7f9f1ff60a4ab (diff) | |
| download | gitlab-ce-resolve-buttons-path.tar.gz | |
Changed props to use stringsresolve-buttons-path
Use jQuery
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js | 6 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/CHANGELOG b/CHANGELOG index 23a5071f5d2..7975c5f8494 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ v 8.12.0 (unreleased) - Filter tags by name !6121 - Update gitlab shell secret file also when it is empty. !3774 (glensc) - Give project selection dropdowns responsive width, make non-wrapping. + - Fix resolve discussion buttons endpoint path - Fix note form hint showing slash commands supported for commits. - Make push events have equal vertical spacing. - API: Ensure invitees are not returned in Members API. @@ -189,11 +190,6 @@ v 8.11.6 v 8.11.5 - Optimize branch lookups and force a repository reload for Repository#find_branch. !6087 - Fix member expiration date picker after update. !6184 - -v 8.11.5 (unreleased) - - Optimize branch lookups and force a repository reload for Repository#find_branch - - Fix resolve discussion buttons endpoint path - - Fix member expiration date picker after update - Fix suggested colors options for new labels in the admin area. !6138 - Optimize discussion notes resolving and unresolving - Fix GitLab import button diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index ae2214767a8..866a04d3e21 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -432,9 +432,9 @@ var $form = $(xhr.target); if ($form.attr('data-resolve-all') != null) { - var projectPath = $form.attr('data-project-path') - discussionId = $form.attr('data-discussion-id'), - mergeRequestId = $form.attr('data-noteable-iid'); + var projectPath = $form.data('project-path') + discussionId = $form.data('discussion-id'), + mergeRequestId = $form.data('noteable-iid'); if (ResolveService != null) { ResolveService.toggleResolveForDiscussion(projectPath, mergeRequestId, discussionId); diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 6e0addd35aa..788be4a0047 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -24,12 +24,12 @@ - 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{ "project-path" => "#{project_path(note.project)}", + "discussion-id" => "#{note.discussion_id}", ":note-id" => note.id, ":resolved" => note.resolved?, ":can-resolve" => can_resolve, - ":resolved-by" => "'#{note.resolved_by.try(:name)}'", + "resolved-by" => "#{note.resolved_by.try(:name)}", "v-show" => "#{can_resolve || note.resolved?}", "inline-template" => true, "v-ref:note_#{note.id}" => true } |