diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/assets/javascripts/batch_comments/components/review_bar.vue | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) | |
download | gitlab-ce-0ea3fcec397b69815975647f5e2aa5fe944a8486.tar.gz |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/batch_comments/components/review_bar.vue')
-rw-r--r-- | app/assets/javascripts/batch_comments/components/review_bar.vue | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/batch_comments/components/review_bar.vue b/app/assets/javascripts/batch_comments/components/review_bar.vue index bce13751448..3cd1a2525e9 100644 --- a/app/assets/javascripts/batch_comments/components/review_bar.vue +++ b/app/assets/javascripts/batch_comments/components/review_bar.vue @@ -1,14 +1,18 @@ <script> import { mapActions, mapGetters } from 'vuex'; +import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { REVIEW_BAR_VISIBLE_CLASS_NAME } from '../constants'; import PreviewDropdown from './preview_dropdown.vue'; import PublishButton from './publish_button.vue'; +import SubmitDropdown from './submit_dropdown.vue'; export default { components: { PreviewDropdown, PublishButton, + SubmitDropdown, }, + mixins: [glFeatureFlagMixin()], computed: { ...mapGetters(['isNotesFetched']), }, @@ -38,7 +42,8 @@ export default { data-qa-selector="review_bar_content" > <preview-dropdown /> - <publish-button class="gl-ml-3" show-count /> + <publish-button v-if="!glFeatures.mrReviewSubmitComment" class="gl-ml-3" show-count /> + <submit-dropdown v-else /> </div> </nav> </div> |