diff options
| author | Tomislav Nikic <tnikic@gitlab.com> | 2019-07-27 04:23:34 +0000 |
|---|---|---|
| committer | Dan Davison <ddavison@gitlab.com> | 2019-07-27 04:23:34 +0000 |
| commit | 972573e35183c50de37ce7eec1346f20a23bfca1 (patch) | |
| tree | 6e3cd1f16ea85a79f04ef4c4f494a7ab5d0fa4c9 /app/assets/javascripts/notes | |
| parent | 7dccb44448aed3227072154f2385383c54f2d4f6 (diff) | |
| download | gitlab-ce-972573e35183c50de37ce7eec1346f20a23bfca1.tar.gz | |
Adding changes to CE from EE
All the changes done to files that are also inside CE and need to be
ported.
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/discussion_actions.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/components/note_form.vue | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_actions.vue b/app/assets/javascripts/notes/components/discussion_actions.vue index 7aa8580d794..edab750b572 100644 --- a/app/assets/javascripts/notes/components/discussion_actions.vue +++ b/app/assets/javascripts/notes/components/discussion_actions.vue @@ -41,8 +41,8 @@ export default { <template> <div class="discussion-with-resolve-btn clearfix"> <reply-placeholder + data-qa-selector="discussion_reply_tab" :button-text="s__('MergeRequests|Reply...')" - class="qa-discussion-reply" @onClick="$emit('showReplyForm')" /> diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue index 3823861c0b9..222badf70d1 100644 --- a/app/assets/javascripts/notes/components/note_form.vue +++ b/app/assets/javascripts/notes/components/note_form.vue @@ -293,12 +293,16 @@ export default { <input v-model="isUnresolving" type="checkbox" - class="qa-unresolve-review-discussion" + data-qa-selector="unresolve_review_discussion_checkbox" /> {{ __('Unresolve thread') }} </template> <template v-else> - <input v-model="isResolving" type="checkbox" class="qa-resolve-review-discussion" /> + <input + v-model="isResolving" + type="checkbox" + data-qa-selector="resolve_review_discussion_checkbox" + /> {{ __('Resolve thread') }} </template> </label> |