From 201937191f51343c4cc8ee1e43b02db1fc22754a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 7 May 2024 12:10:36 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/layout/argument_alignment.yml | 17 -- .../layout/space_in_lambda_literal.yml | 15 -- .../lint/ambiguous_operator_precedence.yml | 11 - .rubocop_todo/lint/symbol_conversion.yml | 16 -- .rubocop_todo/rspec/feature_category.yml | 1 - .rubocop_todo/rspec/named_subject.yml | 2 - GITALY_SERVER_VERSION | 2 +- Gemfile | 1 - Gemfile.checksum | 2 - Gemfile.lock | 7 - app/assets/images/auth_buttons/twitter_64.png | Bin 3695 -> 0 bytes .../components/ci_variable_drawer.vue | 16 +- .../components/ci_variable_table.vue | 10 +- .../javascripts/ci/common/pipelines_table.vue | 2 +- .../ci/job_details/components/job_header.vue | 2 +- .../components/job_cells/job_cell.vue | 2 +- .../components/job_cells/pipeline_cell.vue | 2 +- .../graph/components/job_group_dropdown.vue | 2 +- .../components/stage_column_component.vue | 2 +- .../pipeline_mini_graph/legacy_job_item.vue | 4 +- .../components/pipeline_url.vue | 2 +- .../components/runner_platforms_radio.vue | 2 +- .../components/notes/system_note.vue | 1 + app/assets/stylesheets/framework/mixins.scss | 4 + app/graphql/mutations/ci/job/base.rb | 4 +- app/graphql/mutations/ci/job/cancel.rb | 6 +- app/graphql/mutations/ci/job/play.rb | 14 +- app/graphql/mutations/ci/job/retry.rb | 18 +- app/graphql/mutations/ci/job/unschedule.rb | 6 +- .../mutations/ci/job_artifact/destroy.rb | 12 +- .../ci/job_token_scope/add_project.rb | 28 +- .../ci/job_token_scope/remove_project.rb | 28 +- app/graphql/mutations/ci/pipeline/base.rb | 4 +- app/graphql/mutations/ci/pipeline/retry.rb | 6 +- .../mutations/ci/pipeline_schedule/base.rb | 4 +- .../mutations/ci/pipeline_schedule/create.rb | 36 +-- .../mutations/ci/pipeline_schedule/play.rb | 6 +- .../ci/pipeline_schedule/take_ownership.rb | 4 +- .../mutations/ci/pipeline_schedule/update.rb | 32 +-- .../mutations/ci/runner/bulk_delete.rb | 20 +- app/helpers/system_note_helper.rb | 3 +- app/models/concerns/relative_positioning.rb | 2 +- app/models/design_management/version.rb | 2 +- .../chat_message/pipeline_message.rb | 4 +- app/models/integrations/phorge.rb | 1 + app/models/merge_request_diff.rb | 2 +- app/models/namespace.rb | 4 +- app/models/network/graph.rb | 2 +- app/models/note.rb | 2 +- app/models/notification_reason.rb | 2 +- .../packages/terraform_module/metadatum.rb | 2 +- app/models/project_feature.rb | 2 +- app/models/system_note_metadata.rb | 2 +- app/models/terraform/state.rb | 2 +- app/models/webauthn_registration.rb | 2 +- .../update_reviewer_state_service.rb | 2 + app/services/notes/base_service.rb | 10 +- app/services/notes/create_service.rb | 12 - .../metadata/create_service.rb | 42 +++ .../metadata/extract_files_service.rb | 104 ++++++-- .../metadata/parse_hcl_file_service.rb | 211 +++++++++++++++ .../metadata/process_file_service.rb | 73 ++++++ .../process_package_file_service.rb | 6 +- app/services/system_note_service.rb | 4 + .../system_notes/merge_requests_service.rb | 6 + .../terraform_module_metadata.json | 141 +++++----- app/views/search/_results_status.html.haml | 20 +- .../shared/web_hooks/_hook_errors.html.haml | 2 +- config/events/create_commit_note.yml | 20 ++ config/events/create_snippet_note.yml | 20 ++ config/gitlab.yml.example | 20 +- .../helpers/vite_plugin_page_entrypoints.mjs | 47 ++-- .../20210216180253_snippet_comment.yml | 8 +- .../20210216182004_commit_comment.yml | 8 +- .../monitoring/prometheus/index.md | 12 +- .../reference_architectures/10k_users.md | 101 ++++---- .../reference_architectures/1k_users.md | 6 +- .../reference_architectures/25k_users.md | 97 ++++--- .../reference_architectures/2k_users.md | 91 ++++--- .../reference_architectures/3k_users.md | 95 ++++--- .../reference_architectures/50k_users.md | 97 ++++--- .../reference_architectures/5k_users.md | 97 ++++--- .../reference_architectures/index.md | 91 ++++--- doc/administration/system_hooks.md | 17 +- doc/api/graphql/reference/index.md | 26 +- doc/integration/img/twitter_app_api_keys.png | Bin 24570 -> 0 bytes doc/integration/img/twitter_app_details.png | Bin 40392 -> 0 bytes doc/integration/jenkins.md | 3 +- doc/integration/omniauth.md | 41 ++- doc/integration/twitter.md | 108 +------- .../img/devops_metrics_comparison_v15_8.png | Bin 82446 -> 0 bytes doc/user/analytics/value_streams_dashboard.md | 37 ++- doc/user/project/integrations/webhooks.md | 110 ++++---- .../usage_data_counters/note_counter.rb | 2 +- .../total_counter_redis_key_overrides.yml | 2 + locale/gitlab.pot | 51 ++-- .../packages/terraform_module/metadata.rb | 2 +- spec/features/oauth_login_spec.rb | 2 +- .../registrations/oauth_registration_spec.rb | 1 - .../packages/terraform_module/metadata.json | 152 +++++++++++ .../graph/components/graph_component_spec.js | 2 +- spec/helpers/system_note_helper_spec.rb | 18 ++ .../api/helpers/integrations_helpers_spec.rb | 2 +- .../usage_data_counters/note_counter_spec.rb | 14 +- spec/models/integrations/phorge_spec.rb | 2 + .../terraform_module/metadatum_spec.rb | 24 +- spec/models/system_note_metadata_spec.rb | 2 +- .../ml/experiments_controller_spec.rb | 2 +- .../pipeline_test_report_builder_spec.rb | 24 +- .../artifact_entity_spec.rb | 44 ++-- .../harbor_serializers/tag_entity_spec.rb | 16 +- .../get_importable_data_service_spec.rb | 2 +- .../atomic_processing_service_spec.rb | 56 ++-- spec/services/git/base_hooks_service_spec.rb | 2 +- .../create_service_spec.rb | 2 +- .../jira_connect/sync_service_spec.rb | 6 +- .../update_reviewer_state_service_spec.rb | 7 + .../candidate_repository_spec.rb | 16 +- spec/services/notes/create_service_spec.rb | 77 ++---- .../metadata/create_service_spec.rb | 51 ++++ .../metadata/extract_files_service_spec.rb | 174 +++++++++++-- .../metadata/parse_hcl_file_service_spec.rb | 189 ++++++++++++++ .../metadata/process_file_service_spec.rb | 245 ++++++++++++++++++ .../process_package_file_service_spec.rb | 10 +- spec/services/system_note_service_spec.rb | 10 + .../merge_requests_service_spec.rb | 14 + spec/support/helpers/kubernetes_helpers.rb | 16 +- spec/support/helpers/prometheus_helpers.rb | 68 ++--- .../helpers/user_with_namespace_shim.yml | 1 - spec/support/rspec_order_todo.yml | 1 - .../artifacts_controller_shared_examples.rb | 38 +-- ...repositories_controller_shared_examples.rb | 30 +-- .../harbor/tags_controller_shared_examples.rb | 18 +- .../diff_positionable_note_shared_examples.rb | 10 +- .../import_gist_worker_spec.rb | 2 +- .../typo3_distribution.tar.gz | Bin 80500 -> 80371 bytes vite.config.js | 13 +- 137 files changed, 2356 insertions(+), 1236 deletions(-) delete mode 100644 app/assets/images/auth_buttons/twitter_64.png create mode 100644 app/services/packages/terraform_module/metadata/create_service.rb create mode 100644 app/services/packages/terraform_module/metadata/parse_hcl_file_service.rb create mode 100644 app/services/packages/terraform_module/metadata/process_file_service.rb create mode 100644 config/events/create_commit_note.yml create mode 100644 config/events/create_snippet_note.yml delete mode 100644 doc/integration/img/twitter_app_api_keys.png delete mode 100644 doc/integration/img/twitter_app_details.png delete mode 100644 doc/user/analytics/img/devops_metrics_comparison_v15_8.png create mode 100644 spec/fixtures/packages/terraform_module/metadata.json create mode 100644 spec/helpers/system_note_helper_spec.rb create mode 100644 spec/services/packages/terraform_module/metadata/create_service_spec.rb create mode 100644 spec/services/packages/terraform_module/metadata/parse_hcl_file_service_spec.rb create mode 100644 spec/services/packages/terraform_module/metadata/process_file_service_spec.rb diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml index 98843e90fda..3c9a256a2f8 100644 --- a/.rubocop_todo/layout/argument_alignment.yml +++ b/.rubocop_todo/layout/argument_alignment.yml @@ -2,22 +2,6 @@ # Cop supports --autocorrect. Layout/ArgumentAlignment: Exclude: - - 'app/graphql/mutations/ci/job/base.rb' - - 'app/graphql/mutations/ci/job/cancel.rb' - - 'app/graphql/mutations/ci/job/play.rb' - - 'app/graphql/mutations/ci/job/retry.rb' - - 'app/graphql/mutations/ci/job/unschedule.rb' - - 'app/graphql/mutations/ci/job_artifact/destroy.rb' - - 'app/graphql/mutations/ci/job_token_scope/add_project.rb' - - 'app/graphql/mutations/ci/job_token_scope/remove_project.rb' - - 'app/graphql/mutations/ci/pipeline/base.rb' - - 'app/graphql/mutations/ci/pipeline/retry.rb' - - 'app/graphql/mutations/ci/pipeline_schedule/base.rb' - - 'app/graphql/mutations/ci/pipeline_schedule/create.rb' - - 'app/graphql/mutations/ci/pipeline_schedule/play.rb' - - 'app/graphql/mutations/ci/pipeline_schedule/take_ownership.rb' - - 'app/graphql/mutations/ci/pipeline_schedule/update.rb' - - 'app/graphql/mutations/ci/runner/bulk_delete.rb' - 'app/graphql/mutations/customer_relations/contacts/base.rb' - 'app/graphql/mutations/customer_relations/contacts/create.rb' - 'app/graphql/mutations/customer_relations/contacts/update.rb' @@ -173,7 +157,6 @@ Layout/ArgumentAlignment: - 'ee/app/graphql/mutations/iterations/cadences/destroy.rb' - 'ee/app/graphql/mutations/iterations/create.rb' - 'ee/app/graphql/mutations/iterations/update.rb' - - 'ee/app/graphql/mutations/namespaces/base.rb' - 'ee/app/graphql/mutations/projects/initialize_product_analytics.rb' - 'ee/app/graphql/mutations/projects/set_compliance_framework.rb' - 'ee/app/graphql/mutations/quality_management/test_cases/create.rb' diff --git a/.rubocop_todo/layout/space_in_lambda_literal.yml b/.rubocop_todo/layout/space_in_lambda_literal.yml index ecce1dd8ca5..5ed87aec7e9 100644 --- a/.rubocop_todo/layout/space_in_lambda_literal.yml +++ b/.rubocop_todo/layout/space_in_lambda_literal.yml @@ -172,21 +172,6 @@ Layout/SpaceInLambdaLiteral: - 'ee/app/models/ee/release.rb' - 'ee/app/models/ee/vulnerability.rb' - 'ee/app/models/elasticsearch_indexed_namespace.rb' - - 'ee/app/models/geo_node.rb' - - 'ee/app/models/gitlab_subscription.rb' - - 'ee/app/models/incident_management/escalation_policy.rb' - - 'ee/app/models/incident_management/escalation_rule.rb' - - 'ee/app/models/incident_management/oncall_participant.rb' - - 'ee/app/models/incident_management/oncall_rotation.rb' - - 'ee/app/models/incident_management/oncall_schedule.rb' - - 'ee/app/models/incident_management/oncall_shift.rb' - - 'ee/app/models/iteration.rb' - - 'ee/app/models/iterations/cadence.rb' - - 'ee/app/models/merge_request_block.rb' - - 'ee/app/models/merge_requests/compliance_violation.rb' - - 'ee/app/models/namespaces/namespace_ban.rb' - - 'ee/app/models/requirements_management/requirement.rb' - - 'ee/app/models/resource_iteration_event.rb' - 'ee/app/models/saml_group_link.rb' - 'ee/app/models/sca/license_compliance.rb' - 'ee/app/models/security/finding.rb' diff --git a/.rubocop_todo/lint/ambiguous_operator_precedence.yml b/.rubocop_todo/lint/ambiguous_operator_precedence.yml index 63f21322716..52f15491b85 100644 --- a/.rubocop_todo/lint/ambiguous_operator_precedence.yml +++ b/.rubocop_todo/lint/ambiguous_operator_precedence.yml @@ -11,17 +11,6 @@ Lint/AmbiguousOperatorPrecedence: - 'app/helpers/timeboxes_helper.rb' - 'app/helpers/tree_helper.rb' - 'app/helpers/users_helper.rb' - - 'app/models/concerns/relative_positioning.rb' - - 'app/models/design_management/version.rb' - - 'app/models/integrations/chat_message/pipeline_message.rb' - - 'app/models/merge_request_diff.rb' - - 'app/models/namespace.rb' - - 'app/models/network/graph.rb' - - 'app/models/note.rb' - - 'app/models/notification_reason.rb' - - 'app/models/project_feature.rb' - - 'app/models/terraform/state.rb' - - 'app/models/webauthn_registration.rb' - 'app/presenters/project_presenter.rb' - 'app/services/cohorts_service.rb' - 'app/services/concerns/validates_classification_label.rb' diff --git a/.rubocop_todo/lint/symbol_conversion.yml b/.rubocop_todo/lint/symbol_conversion.yml index fef77e03433..23cc1a790b8 100644 --- a/.rubocop_todo/lint/symbol_conversion.yml +++ b/.rubocop_todo/lint/symbol_conversion.yml @@ -91,19 +91,3 @@ Lint/SymbolConversion: - 'spec/requests/api/terraform/state_spec.rb' - 'spec/requests/mailgun/webhooks_controller_spec.rb' - 'spec/requests/users_controller_spec.rb' - - 'spec/scripts/pipeline_test_report_builder_spec.rb' - - 'spec/serializers/integrations/harbor_serializers/artifact_entity_spec.rb' - - 'spec/serializers/integrations/harbor_serializers/tag_entity_spec.rb' - - 'spec/services/bulk_imports/get_importable_data_service_spec.rb' - - 'spec/services/ci/pipeline_processing/atomic_processing_service_spec.rb' - - 'spec/services/git/base_hooks_service_spec.rb' - - 'spec/services/incident_management/timeline_event_tags/create_service_spec.rb' - - 'spec/services/jira_connect/sync_service_spec.rb' - - 'spec/services/ml/experiment_tracking/candidate_repository_spec.rb' - - 'spec/support/helpers/kubernetes_helpers.rb' - - 'spec/support/helpers/prometheus_helpers.rb' - - 'spec/support/shared_examples/harbor/artifacts_controller_shared_examples.rb' - - 'spec/support/shared_examples/harbor/repositories_controller_shared_examples.rb' - - 'spec/support/shared_examples/harbor/tags_controller_shared_examples.rb' - - 'spec/support/shared_examples/models/diff_positionable_note_shared_examples.rb' - - 'spec/workers/gitlab/github_gists_import/import_gist_worker_spec.rb' diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml index a9ff8f34001..05735c1cfa3 100644 --- a/.rubocop_todo/rspec/feature_category.yml +++ b/.rubocop_todo/rspec/feature_category.yml @@ -176,7 +176,6 @@ RSpec/FeatureCategory: - 'ee/spec/graphql/mutations/merge_requests/accept_spec.rb' - 'ee/spec/graphql/mutations/merge_requests/set_assignees_spec.rb' - 'ee/spec/graphql/mutations/merge_requests/set_reviewers_spec.rb' - - 'ee/spec/graphql/mutations/namespaces/increase_storage_temporarily_spec.rb' - 'ee/spec/graphql/mutations/projects/set_compliance_framework_spec.rb' - 'ee/spec/graphql/mutations/projects/set_locked_spec.rb' - 'ee/spec/graphql/mutations/releases/update_spec.rb' diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml index c533591bf66..681ce1e55ef 100644 --- a/.rubocop_todo/rspec/named_subject.yml +++ b/.rubocop_todo/rspec/named_subject.yml @@ -140,7 +140,6 @@ RSpec/NamedSubject: - 'ee/spec/graphql/mutations/issues/update_spec.rb' - 'ee/spec/graphql/mutations/merge_requests/set_reviewers_spec.rb' - 'ee/spec/graphql/mutations/merge_requests/update_approval_rules_spec.rb' - - 'ee/spec/graphql/mutations/namespaces/increase_storage_temporarily_spec.rb' - 'ee/spec/graphql/mutations/projects/set_locked_spec.rb' - 'ee/spec/graphql/mutations/releases/update_spec.rb' - 'ee/spec/graphql/mutations/requirements_management/create_requirement_spec.rb' @@ -261,7 +260,6 @@ RSpec/NamedSubject: - 'ee/spec/lib/bulk_imports/groups/pipelines/iterations_cadences_pipeline_spec.rb' - 'ee/spec/lib/bulk_imports/groups/pipelines/iterations_pipeline_spec.rb' - 'ee/spec/lib/code_suggestions/prompts/code_completion/vertex_ai_spec.rb' - - 'ee/spec/lib/code_suggestions/prompts/code_generation/anthropic_spec.rb' - 'ee/spec/lib/code_suggestions/task_factory_spec.rb' - 'ee/spec/lib/code_suggestions/tasks/base_spec.rb' - 'ee/spec/lib/ee/api/entities/dependency_list_export_spec.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 227a320899c..646bb46956b 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -613fa6169f5750468bdd4a15b1f453ea4f17c45c +86baea59fb2ce0379b40ee571a168cfe8b134079 diff --git a/Gemfile b/Gemfile index 1a6a9ba0dbd..c6afcacc0ab 100644 --- a/Gemfile +++ b/Gemfile @@ -83,7 +83,6 @@ gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCate gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-saml', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-twitter', '~> 1.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. diff --git a/Gemfile.checksum b/Gemfile.checksum index 69f0edc2f70..12837ac8c75 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -436,12 +436,10 @@ {"name":"omniauth-facebook","version":"4.0.0","platform":"ruby","checksum":"05ae3565c8fdb38df8dab04eb8ca854ea6c18e81591d3e6598ce101293a2f20f"}, {"name":"omniauth-github","version":"2.0.1","platform":"ruby","checksum":"8ff8e70ac6d6db9d52485eef52cfa894938c941496e66b52b5e2773ade3ccad4"}, {"name":"omniauth-google-oauth2","version":"1.1.1","platform":"ruby","checksum":"4496f126e84eaf760f9c6a5c69e5e7511f98092d7f25ad79fd2c0ae5e09b5039"}, -{"name":"omniauth-oauth","version":"1.2.0","platform":"ruby","checksum":"e7a78658498dc83aa3f3be1a776425c0f06a60d45d9236dbe5e98e61fadf827b"}, {"name":"omniauth-oauth2","version":"1.8.0","platform":"ruby","checksum":"b2f8e9559cc7e2d4efba57607691d6d2b634b879fc5b5b6ccfefa3da85089e78"}, {"name":"omniauth-oauth2-generic","version":"0.2.8","platform":"ruby","checksum":"ce6e8539019d5ebf2f48867072b9f248f148bb4cbe7166dee655865abfae7613"}, {"name":"omniauth-saml","version":"2.1.0","platform":"ruby","checksum":"969cb7ba271891d09dfa57b206fc274f43203c52727492517decda93decc6906"}, {"name":"omniauth-shibboleth-redux","version":"2.0.0","platform":"ruby","checksum":"e9b353fd103405fcc8549e8510b9cad857acf0b286d764fac5dba8a93ab8ffe1"}, -{"name":"omniauth-twitter","version":"1.4.0","platform":"ruby","checksum":"c5cc6c77cd767745ffa9ebbd5fbd694a3fa99d1d2d82a4d7def0bf3b6131b264"}, {"name":"omniauth_openid_connect","version":"0.6.1","platform":"ruby","checksum":"5f1318f5b19b05e339ff494def060b57a503b1e3ea83c3a0ced6cc014407d423"}, {"name":"open4","version":"1.3.4","platform":"ruby","checksum":"a1df037310624ecc1ea1d81264b11c83e96d0c3c1c6043108d37d396dcd0f4b1"}, {"name":"openid_connect","version":"1.3.0","platform":"ruby","checksum":"a796855096850cc01140e37ea6ae9fd14f2be818b9b5bc698418063dfe228770"}, diff --git a/Gemfile.lock b/Gemfile.lock index a5bc90e3fc7..10335f7938a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1195,9 +1195,6 @@ GEM oauth2 (~> 2.0.6) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8.0) - omniauth-oauth (1.2.0) - oauth - omniauth (>= 1.0, < 3) omniauth-oauth2 (1.8.0) oauth2 (>= 1.4, < 3) omniauth (~> 2.0) @@ -1209,9 +1206,6 @@ GEM ruby-saml (~> 1.12) omniauth-shibboleth-redux (2.0.0) omniauth (>= 2.0.0) - omniauth-twitter (1.4.0) - omniauth-oauth (~> 1.1) - rack omniauth_openid_connect (0.6.1) omniauth (>= 1.9, < 3) openid_connect (~> 1.1) @@ -2124,7 +2118,6 @@ DEPENDENCIES omniauth-salesforce (~> 1.0.5)! omniauth-saml (~> 2.1.0) omniauth-shibboleth-redux (~> 2.0) - omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! omniauth_openid_connect (~> 0.6.1) openid_connect (= 1.3.0) diff --git a/app/assets/images/auth_buttons/twitter_64.png b/app/assets/images/auth_buttons/twitter_64.png deleted file mode 100644 index 15596b0f30ae701b5decb5e42a1ec43893fc2aed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3695 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 LD^%%ex0wF{*5R1q diff --git a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_drawer.vue b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_drawer.vue index b85e91375d4..34e14abefc2 100644 --- a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_drawer.vue +++ b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_drawer.vue @@ -416,8 +416,8 @@ export default { label-for="ci-variable-type" class="gl-border-none" :class="{ - 'gl-mb-n5': !hideEnvironmentScope, - 'gl-mb-n1': hideEnvironmentScope, + '-gl-mb-5': !hideEnvironmentScope, + '-gl-mb-1': hideEnvironmentScope, }" > @@ -464,9 +464,9 @@ export default { readonly /> - +