diff options
| author | Dan Davison <ddavison@gitlab.com> | 2019-07-27 04:23:35 +0000 |
|---|---|---|
| committer | Dan Davison <ddavison@gitlab.com> | 2019-07-27 04:23:35 +0000 |
| commit | 5861b9fd32435a0e691646e7ffef19dec2561ecf (patch) | |
| tree | 6e3cd1f16ea85a79f04ef4c4f494a7ab5d0fa4c9 /app/assets/javascripts/notes/components/discussion_actions.vue | |
| parent | 7dccb44448aed3227072154f2385383c54f2d4f6 (diff) | |
| parent | 972573e35183c50de37ce7eec1346f20a23bfca1 (diff) | |
| download | gitlab-ce-5861b9fd32435a0e691646e7ffef19dec2561ecf.tar.gz | |
Merge branch 'qa-fixing-add_batch_comments' into 'master'
CE backport for changes in EE MR 14746
See merge request gitlab-org/gitlab-ce!30944
Diffstat (limited to 'app/assets/javascripts/notes/components/discussion_actions.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/discussion_actions.vue | 2 |
1 files changed, 1 insertions, 1 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')" /> |