diff options
| author | Tomislav Nikic <tnikic@gitlab.com> | 2019-07-27 07:23:34 +0300 |
|---|---|---|
| committer | Dan Davison <ddavison@gitlab.com> | 2019-07-27 07:23:34 +0300 |
| commit | 972573e35183c50de37ce7eec1346f20a23bfca1 (patch) | |
| tree | 6e3cd1f16ea85a79f04ef4c4f494a7ab5d0fa4c9 /app/assets/javascripts/diffs | |
| parent | 7dccb44448aed3227072154f2385383c54f2d4f6 (diff) | |
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/diffs')
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_discussion_reply.vue | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_file_header.vue | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_discussion_reply.vue b/app/assets/javascripts/diffs/components/diff_discussion_reply.vue index 2aa5e9b3339..531ebaddacd 100644 --- a/app/assets/javascripts/diffs/components/diff_discussion_reply.vue +++ b/app/assets/javascripts/diffs/components/diff_discussion_reply.vue @@ -44,7 +44,6 @@ export default { class="d-none d-sm-block" /> <reply-placeholder - class="qa-discussion-reply" :button-text="__('Start a new discussion...')" @onClick="$emit('showNewDiscussionForm')" /> diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue index 4b226e30699..32fbeaaa905 100644 --- a/app/assets/javascripts/diffs/components/diff_file_header.vue +++ b/app/assets/javascripts/diffs/components/diff_file_header.vue @@ -263,6 +263,7 @@ export default { :disabled="!diffHasDiscussions(diffFile)" :class="{ active: hasExpandedDiscussions }" class="js-btn-vue-toggle-comments btn" + data-qa-selector="toggle_comments_button" type="button" @click="handleToggleDiscussions" > |