From b9b0853302fbbf003c31dd24c746df141adeaca0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 30 Oct 2024 15:26:21 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../deployment/deployment_action_button.vue | 4 +- .../deployment/deployment_actions.vue | 2 +- app/assets/stylesheets/framework/common.scss | 2 - .../page_bundles/merge_requests.scss | 32 +---------- ..._cycle_analytics_value_stream_settings.yml | 11 +--- ...s_cycle_analytics_value_stream_settings.rb | 11 ++++ ...s_value_stream_settings_on_namespace_id.rb | 16 ++++++ ...s_value_stream_settings_namespace_id_fk.rb | 17 ++++++ ...ue_stream_settings_namespace_id_trigger.rb | 25 ++++++++ db/schema_migrations/20241017124709 | 1 + db/schema_migrations/20241017124710 | 1 + db/schema_migrations/20241017124711 | 1 + db/schema_migrations/20241017124712 | 1 + db/structure.sql | 24 ++++++++ .../two_single_node_external_services.md | 2 +- .../configure_duo_features.md | 2 +- doc/ci/jobs/index.md | 14 ++--- doc/development/observability/index.md | 5 +- ...scan_execution_policy_rule_mode_v15_11.png | Bin 38646 -> 0 bytes .../scan_execution_policy_rule_mode_v17_5.png | Bin 0 -> 141816 bytes .../policies/scan_execution_policies.md | 54 ++++++++++-------- .../secret_detection/pipeline/index.md | 26 ++++----- .../secret_push_protection/index.md | 10 ++-- locale/gitlab.pot | 3 - .../docker_run/container_registry_utils.rb | 9 ++- 25 files changed, 170 insertions(+), 103 deletions(-) create mode 100644 db/migrate/20241017124709_add_namespace_id_to_analytics_cycle_analytics_value_stream_settings.rb create mode 100644 db/post_migrate/20241017124710_index_analytics_cycle_analytics_value_stream_settings_on_namespace_id.rb create mode 100644 db/post_migrate/20241017124711_add_analytics_cycle_analytics_value_stream_settings_namespace_id_fk.rb create mode 100644 db/post_migrate/20241017124712_add_analytics_cycle_analytics_value_stream_settings_namespace_id_trigger.rb create mode 100644 db/schema_migrations/20241017124709 create mode 100644 db/schema_migrations/20241017124710 create mode 100644 db/schema_migrations/20241017124711 create mode 100644 db/schema_migrations/20241017124712 delete mode 100644 doc/user/application_security/policies/img/scan_execution_policy_rule_mode_v15_11.png create mode 100644 doc/user/application_security/policies/img/scan_execution_policy_rule_mode_v17_5.png diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue index 3eade5996a8..fd0aa601f74 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue @@ -66,7 +66,7 @@ export default { :aria-label="buttonTitle" :loading="isLoading" :disabled="isActionInProgress" - :class="`gl-ml-3 ${containerClasses}`" + :class="containerClasses" :icon="icon" @click="$emit('click')" > @@ -81,7 +81,7 @@ export default { :aria-label="buttonTitle" :loading="isLoading" :disabled="isActionInProgress" - :class="`gl-ml-3 ${containerClasses}`" + :class="containerClasses" :icon="icon" @click="$emit('click')" > diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue index 6dad38dfbab..c3d2d0eae0d 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue @@ -151,7 +151,7 @@ export default {