1 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_actions.vue b/app/assets/javascripts/notes/components/discussion_actions.vue
index 251199f1778..878a748e99a 100644
--- a/app/assets/javascripts/notes/components/discussion_actions.vue
+++ b/app/assets/javascripts/notes/components/discussion_actions.vue
@@ -3,6 +3,7 @@ import ReplyPlaceholder from './discussion_reply_placeholder.vue';
 import ResolveDiscussionButton from './discussion_resolve_button.vue';
 import ResolveWithIssueButton from './discussion_resolve_with_issue_button.vue';
 import JumpToNextDiscussionButton from './discussion_jump_to_next_button.vue';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 export default {
   name: 'DiscussionActions',
@@ -12,6 +13,7 @@ export default {
     ResolveWithIssueButton,
     JumpToNextDiscussionButton,
   },
+  mixins: [glFeatureFlagsMixin()],
   props: {
     discussion: {
       type: Object,
@@ -36,6 +38,9 @@ export default {
     },
   },
   computed: {
+    hideJumpToNextUnresolvedInThreads() {
+      return this.glFeatures.hideJumpToNextUnresolvedInThreads;
+    },
     resolvableNotes() {
       return this.discussion.notes.filter(x => x.resolvable);
     },
@@ -70,7 +75,11 @@ export default {
       />
     </div>
     <div
-      v-if="discussion.resolvable && shouldShowJumpToNextDiscussion"
+      v-if="
+        !hideJumpToNextUnresolvedInThreads &&
+          discussion.resolvable &&
+          shouldShowJumpToNextDiscussion
+      "
       class="btn-group discussion-actions ml-sm-2"
     >
       <jump-to-next-discussion-button :from-discussion-id="discussion.id" />