diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-08 14:13:01 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-08 14:13:01 +0000 |
| commit | d236f6d74bf781b6f607955b8b49367afa9c4010 (patch) | |
| tree | f6a82f1191835572cd7144f4e7fdfe24ae37fcad | |
| parent | a6794a2736e9df488d4d8b5b336fded0b58d7d26 (diff) | |
| parent | 0477ff637cb55d33db9bdebc5e3689350575ffe3 (diff) | |
| download | gitlab-ce-d236f6d74bf781b6f607955b8b49367afa9c4010.tar.gz | |
Merge branch 'winh-draft_note_spec-vue-test-utils' into 'master'
Refactor draft_note_spec.js to Vue test utils (CE backport)
See merge request gitlab-org/gitlab-ce!25016
| -rw-r--r-- | app/assets/javascripts/notes/components/note_actions.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index cad0d382fa2..91b9e5de374 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -135,6 +135,7 @@ export default { <span v-if="accessLevel" class="note-role user-access-role">{{ accessLevel }}</span> <div v-if="canResolve" class="note-actions-item"> <button + ref="resolveButton" v-gl-tooltip :class="{ 'is-disabled': !resolvable, 'is-active': isResolved }" :title="resolveButtonTitle" |