diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-22 18:12:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-22 18:12:06 +0300 |
commit | 2cdb1c566d84a3dbea0a2e5825fa112b046b6c83 (patch) | |
tree | 734d789d2ce71a55f9effc509ef4e4098c70a35f /app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | |
parent | 03529a126f230d59e8528c4814f240fd761f286d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index 78aa3941bfe..feca05a9329 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -38,7 +38,7 @@ import ReadyToMergeState from './components/states/ready_to_merge.vue'; import ShaMismatch from './components/states/sha_mismatch.vue'; import UnresolvedDiscussionsState from './components/states/unresolved_discussions.vue'; import WorkInProgressState from './components/states/work_in_progress.vue'; -// import ExtensionsContainer from './components/extensions/container'; +import ExtensionsContainer from './components/extensions/container'; import eventHub from './event_hub'; import mergeRequestQueryVariablesMixin from './mixins/merge_request_query_variables'; import getStateQuery from './queries/get_state.query.graphql'; @@ -52,7 +52,7 @@ export default { }, components: { Loading, - // ExtensionsContainer, + ExtensionsContainer, 'mr-widget-header': WidgetHeader, 'mr-widget-suggest-pipeline': WidgetSuggestPipeline, MrWidgetPipelineContainer, @@ -496,7 +496,7 @@ export default { </template> </mr-widget-alert-message> </div> - <!-- <extensions-container :mr="mr" /> --> + <extensions-container :mr="mr" /> <grouped-codequality-reports-app v-if="shouldRenderCodeQuality" :head-blob-path="mr.headBlobPath" |