Automatic merge of gitlab-org/gitlab master

app/assets/javascripts/blob/notebook/notebook_viewer.vue

app/assets/javascripts/notebook/cells/code.vue

app/assets/javascripts/notebook/cells/code/index.vue

app/assets/javascripts/notebook/cells/output/index.vue

app/assets/javascripts/notebook/index.vue

app/assets/javascripts/notebook/lib/highlight.js

...ts/settings_service_desk/components/service_desk_root.vue

...ssets/javascripts/projects/settings_service_desk/index.js

...pts/vue_merge_request_widget/components/widget/widget.vue

...s/javascripts/vue_shared/components/code_block.stories.js

app/assets/javascripts/vue_shared/components/code_block.vue

...s/vue_shared/components/code_block_highlighted.stories.js

...ascripts/vue_shared/components/code_block_highlighted.vue

app/assets/stylesheets/framework/files.scss

app/finders/deployments_finder.rb

app/graphql/resolvers/deployment_resolver.rb

app/graphql/resolvers/deployments_resolver.rb

app/graphql/types/deployment_details_type.rb

app/graphql/types/deployment_status_enum.rb

app/graphql/types/deployment_type.rb