diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-04-03 13:54:05 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-04-03 13:54:05 +0000 |
| commit | db12e729a7f0615ccb2fd8cd3209bddc3f7bfe39 (patch) | |
| tree | 8cae9f6f1a184bcbc8c99c015d8390a5c0556ced /app/assets | |
| parent | dd7e927b38814c54cdaa11e8dd09ce6067615509 (diff) | |
| parent | c17b7afa0298beb3290d46ad504f0f4dc4508d7a (diff) | |
| download | gitlab-ce-db12e729a7f0615ccb2fd8cd3209bddc3f7bfe39.tar.gz | |
Merge branch '58644-remove-reply_to_individual_notes-feature-flag' into 'master'
Remove reply_to_individual_notes feature flag
Closes #58644
See merge request gitlab-org/gitlab-ce!26889
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_actions.vue | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index fc73726857d..aabb77f6a85 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -86,9 +86,6 @@ export default { }, computed: { ...mapGetters(['getUserDataByProp']), - showReplyButton() { - return gon.features && gon.features.replyToIndividualNotes && this.showReply; - }, shouldShowActionsDropdown() { return this.currentUserId && (this.canEdit || this.canReportAsAbuse); }, @@ -167,7 +164,7 @@ export default { </a> </div> <reply-button - v-if="showReplyButton" + v-if="showReply" ref="replyButton" class="js-reply-button" @startReplying="$emit('startReplying')" |