Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.haml-lint.yml

@@ -8,7 +8,6 @@ exclude:
   - 'spec/**/*'
   - 'ee/spec/**/*'
 require:
-  - './haml_lint/linter/documentation_links.rb'
   - './haml_lint/linter/inline_javascript.rb'
   - './haml_lint/linter/no_plain_nodes.rb'
 

.rubocop.yml

@@ -465,8 +465,6 @@ Gitlab/DocumentationLinks/HardcodedUrl:
 
 Gitlab/DocumentationLinks/Link:
   Enabled: true
-  Exclude:
-    - '**/*.haml'
 
 GitlabSecurity/PublicSend:
   Enabled: true

.rubocop_todo/gitlab/bounded_contexts.yml

@@ -2279,11 +2279,11 @@ Gitlab/BoundedContexts:
     - 'ee/app/graphql/mutations/iterations/create.rb'
     - 'ee/app/graphql/mutations/iterations/delete.rb'
     - 'ee/app/graphql/mutations/iterations/update.rb'
-    - 'ee/app/graphql/mutations/member_roles/base.rb'
-    - 'ee/app/graphql/mutations/member_roles/create.rb'
     - 'ee/app/graphql/mutations/member_roles/admin/base.rb'
     - 'ee/app/graphql/mutations/member_roles/admin/create.rb'
     - 'ee/app/graphql/mutations/member_roles/admin/update.rb'
+    - 'ee/app/graphql/mutations/member_roles/base.rb'
+    - 'ee/app/graphql/mutations/member_roles/create.rb'
     - 'ee/app/graphql/mutations/member_roles/delete.rb'
     - 'ee/app/graphql/mutations/member_roles/update.rb'
     - 'ee/app/graphql/mutations/quality_management/test_cases/create.rb'

.rubocop_todo/gitlab/strong_memoize_attr.yml

@@ -320,7 +320,6 @@ Gitlab/StrongMemoizeAttr:
     - 'ee/app/services/protected_environments/base_service.rb'
     - 'ee/app/services/security/ingestion/tasks/ingest_vulnerabilities/mark_resolved_as_detected.rb'
     - 'ee/app/services/security/report_summary_service.rb'
-    - 'ee/app/services/security/security_orchestration_policies/on_demand_scan_pipeline_configuration_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/operational_vulnerabilities_configuration_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/validate_policy_service.rb'
     - 'ee/app/services/status_page/publish_attachments_service.rb'

.rubocop_todo/layout/empty_lines_around_method_body.yml

@@ -20,13 +20,11 @@ Layout/EmptyLinesAroundMethodBody:
     - 'lib/gitlab/database/partitioning/list/convert_table.rb'
     - 'lib/gitlab/database/partitioning_migration_helpers/table_management_helpers.rb'
     - 'lib/gitlab/diff/file.rb'
-    - 'lib/gitlab/fp/settings/default_settings_parser.rb'
     - 'lib/gitlab/git/repository.rb'
     - 'lib/gitlab/gitaly_client/operation_service.rb'
     - 'lib/gitlab/import/import_failure_service.rb'
     - 'lib/gitlab/memory/upload_and_cleanup_reports.rb'
     - 'spec/lib/gitlab/database/migrations/test_batched_background_runner_spec.rb'
     - 'spec/lib/gitlab/popen/runner_spec.rb'
     - 'spec/support/helpers/workhorse_lfs_helpers.rb'
-    - 'spec/support/matchers/invoke_rop_steps.rb'
     - 'tooling/lib/tooling/find_changes.rb'

.rubocop_todo/layout/line_end_string_concatenation_indentation.yml

@@ -261,7 +261,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'ee/spec/requests/api/graphql/mutations/iterations/create_spec.rb'
     - 'ee/spec/requests/api/graphql/mutations/iterations/delete_spec.rb'
     - 'ee/spec/requests/api/graphql/mutations/iterations/update_spec.rb'
-    - 'ee/spec/requests/api/graphql/mutations/member_role/create_member_role_spec.rb'
     - 'ee/spec/requests/api/graphql/mutations/projects/initialize_product_analytics_spec.rb'
     - 'ee/spec/requests/api/graphql/mutations/projects/product_analytics_project_settings_update_spec.rb'
     - 'ee/spec/requests/api/graphql/mutations/projects/set_compliance_framework_spec.rb'

.rubocop_todo/layout/line_length.yml

@@ -727,7 +727,6 @@ Layout/LineLength:
     - 'ee/app/services/security/report_summary_service.rb'
     - 'ee/app/services/security/scanned_resources_counting_service.rb'
     - 'ee/app/services/security/scanned_resources_service.rb'
-    - 'ee/app/services/security/security_orchestration_policies/on_demand_scan_pipeline_configuration_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/policy_commit_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/policy_configuration_validation_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/process_policy_service.rb'

.rubocop_todo/rails/inverse_of.yml

@@ -33,7 +33,6 @@ Rails/InverseOf:
     - 'app/models/merge_request/metrics.rb'
     - 'app/models/namespace.rb'
     - 'app/models/notification_setting.rb'
-    - 'app/models/packages/maven/metadatum.rb'
     - 'app/models/project.rb'
     - 'app/models/project_label.rb'
     - 'app/models/resource_state_event.rb'

.rubocop_todo/rspec/be_eq.yml

@@ -1110,7 +1110,6 @@ RSpec/BeEq:
     - 'spec/models/integrations/jira_cloud_app_spec.rb'
     - 'spec/models/integrations/jira_spec.rb'
     - 'spec/models/integrations/prometheus_spec.rb'
-    - 'spec/models/integrations/telegram_spec.rb'
     - 'spec/models/integrations/zentao_tracker_data_spec.rb'
     - 'spec/models/issue_spec.rb'
     - 'spec/models/jira_connect_installation_spec.rb'

.rubocop_todo/rspec/before_all_role_assignment.yml

@@ -330,7 +330,6 @@ RSpec/BeforeAllRoleAssignment:
     - 'ee/spec/requests/api/graphql/boards/epic_lists_query_spec.rb'
     - 'ee/spec/requests/api/graphql/ci/minutes/usage_spec.rb'
     - 'ee/spec/requests/api/graphql/compliance_management/merge_requests/compliance_violations_spec.rb'
-    - 'ee/spec/requests/api/graphql/dora/dora_scores_spec.rb'
     - 'ee/spec/requests/api/graphql/gitlab_subscriptions/preview_billable_user_change_spec.rb'
     - 'ee/spec/requests/api/graphql/group/dast_profile_schedule_spec.rb'
     - 'ee/spec/requests/api/graphql/group/epic/epic_aggregate_query_spec.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -574,7 +574,6 @@ RSpec/ContextWording:
     - 'ee/spec/serializers/dashboard_operations_project_entity_spec.rb'
     - 'ee/spec/serializers/ee/group_child_entity_spec.rb'
     - 'ee/spec/serializers/ee/issue_sidebar_extras_entity_spec.rb'
-    - 'ee/spec/serializers/ee/merge_request_poll_cached_widget_entity_spec.rb'
     - 'ee/spec/serializers/ee/user_serializer_spec.rb'
     - 'ee/spec/serializers/environment_entity_spec.rb'
     - 'ee/spec/serializers/issue_serializer_spec.rb'
@@ -2203,7 +2202,6 @@ RSpec/ContextWording:
     - 'spec/requests/api/project_clusters_spec.rb'
     - 'spec/requests/api/project_container_repositories_spec.rb'
     - 'spec/requests/api/project_events_spec.rb'
-    - 'spec/requests/api/project_export_spec.rb'
     - 'spec/requests/api/project_packages_spec.rb'
     - 'spec/requests/api/project_snippets_spec.rb'
     - 'spec/requests/api/projects_spec.rb'

.rubocop_todo/rspec/feature_category.yml

@@ -674,10 +674,7 @@ RSpec/FeatureCategory:
     - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/count_users_creating_ci_builds_metric_spec.rb'
     - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/count_users_deployment_approvals_spec.rb'
     - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/epics_deepest_relationship_level_metric_spec.rb'
-    - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/historical_max_users_metrics_spec.rb'
     - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/license_management_jobs_metric_spec.rb'
-    - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/license_metric_spec.rb'
-    - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/licensee_metrics_spec.rb'
     - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/protected_environment_approval_rules_required_approvals_average_metric_spec.rb'
     - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/protected_environments_required_approvals_average_metric_spec.rb'
     - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/user_cap_setting_enabled_metric_spec.rb'
@@ -902,7 +899,6 @@ RSpec/FeatureCategory:
     - 'ee/spec/serializers/ee/issue_entity_spec.rb'
     - 'ee/spec/serializers/ee/issue_sidebar_basic_entity_spec.rb'
     - 'ee/spec/serializers/ee/issue_sidebar_extras_entity_spec.rb'
-    - 'ee/spec/serializers/ee/merge_request_poll_cached_widget_entity_spec.rb'
     - 'ee/spec/serializers/ee/note_entity_spec.rb'
     - 'ee/spec/serializers/ee/user_serializer_spec.rb'
     - 'ee/spec/serializers/epic_entity_spec.rb'
@@ -1727,7 +1723,6 @@ RSpec/FeatureCategory:
     - 'spec/helpers/admin/identities_helper_spec.rb'
     - 'spec/helpers/appearances_helper_spec.rb'
     - 'spec/helpers/application_helper_spec.rb'
-    - 'spec/helpers/application_settings_helper_spec.rb'
     - 'spec/helpers/auto_devops_helper_spec.rb'
     - 'spec/helpers/award_emoji_helper_spec.rb'
     - 'spec/helpers/badges_helper_spec.rb'
@@ -2125,7 +2120,6 @@ RSpec/FeatureCategory:
     - 'spec/lib/gitlab/ci/parsers/test/junit_spec.rb'
     - 'spec/lib/gitlab/ci/parsers_spec.rb'
     - 'spec/lib/gitlab/ci/pipeline/chain/build_spec.rb'
-    - 'spec/lib/gitlab/ci/pipeline/chain/command_spec.rb'
     - 'spec/lib/gitlab/ci/pipeline/chain/create_spec.rb'
     - 'spec/lib/gitlab/ci/pipeline/chain/ensure_environments_spec.rb'
     - 'spec/lib/gitlab/ci/pipeline/chain/ensure_resource_groups_spec.rb'
@@ -2502,7 +2496,6 @@ RSpec/FeatureCategory:
     - 'spec/lib/gitlab/git/push_spec.rb'
     - 'spec/lib/gitlab/git/raw_diff_change_spec.rb'
     - 'spec/lib/gitlab/git/remote_mirror_spec.rb'
-    - 'spec/lib/gitlab/git/user_spec.rb'
     - 'spec/lib/gitlab/git/util_spec.rb'
     - 'spec/lib/gitlab/git/wiki_page_version_spec.rb'
     - 'spec/lib/gitlab/git_access_design_spec.rb'
@@ -3764,7 +3757,6 @@ RSpec/FeatureCategory:
     - 'spec/serializers/member_user_entity_spec.rb'
     - 'spec/serializers/merge_request_for_pipeline_entity_spec.rb'
     - 'spec/serializers/merge_request_metrics_helper_spec.rb'
-    - 'spec/serializers/merge_request_poll_widget_entity_spec.rb'
     - 'spec/serializers/merge_request_user_entity_spec.rb'
     - 'spec/serializers/merge_request_widget_commit_entity_spec.rb'
     - 'spec/serializers/merge_requests/pipeline_entity_spec.rb'

.rubocop_todo/rspec/named_subject.yml

@@ -734,7 +734,6 @@ RSpec/NamedSubject:
     - 'ee/spec/serializers/ee/issue_board_entity_spec.rb'
     - 'ee/spec/serializers/ee/issue_entity_spec.rb'
     - 'ee/spec/serializers/ee/issue_sidebar_extras_entity_spec.rb'
-    - 'ee/spec/serializers/ee/merge_request_poll_cached_widget_entity_spec.rb'
     - 'ee/spec/serializers/ee/note_entity_spec.rb'
     - 'ee/spec/serializers/environment_entity_spec.rb'
     - 'ee/spec/serializers/epic_entity_spec.rb'
@@ -2459,7 +2458,6 @@ RSpec/NamedSubject:
     - 'spec/models/integrations/jenkins_spec.rb'
     - 'spec/models/integrations/matrix_spec.rb'
     - 'spec/models/integrations/squash_tm_spec.rb'
-    - 'spec/models/integrations/telegram_spec.rb'
     - 'spec/models/integrations/zentao_spec.rb'
     - 'spec/models/internal_id_spec.rb'
     - 'spec/models/issue/metrics_spec.rb'

.rubocop_todo/rspec/subject_declaration.yml

@@ -72,7 +72,6 @@ RSpec/SubjectDeclaration:
     - 'spec/models/event_collection_spec.rb'
     - 'spec/models/group_spec.rb'
     - 'spec/models/integrations/matrix_spec.rb'
-    - 'spec/models/integrations/telegram_spec.rb'
     - 'spec/models/issue_spec.rb'
     - 'spec/models/project_spec.rb'
     - 'spec/models/x509_certificate_spec.rb'

.rubocop_todo/rspec/verified_double_reference.yml

@@ -3,7 +3,6 @@
 RSpec/VerifiedDoubleReference:
   Exclude:
     - 'ee/spec/controllers/groups/analytics/productivity_analytics_controller_spec.rb'
-    - 'ee/spec/controllers/groups/security/policies_controller_spec.rb'
     - 'ee/spec/features/custom_models/code_suggestions_spec.rb'
     - 'ee/spec/features/custom_models/duo_chat_spec.rb'
     - 'ee/spec/features/merge_request/user_sees_security_policy_rules_licence_compliance_spec.rb'
@@ -49,7 +48,6 @@ RSpec/VerifiedDoubleReference:
     - 'ee/spec/requests/api/graphql/project/google_cloud/artifact_registry/docker_images_spec.rb'
     - 'ee/spec/requests/api/graphql/user_code_suggestions_available_spec.rb'
     - 'ee/spec/requests/api/security_scans_spec.rb'
-    - 'ee/spec/requests/projects/security/policies_controller_spec.rb'
     - 'ee/spec/serializers/dashboard_environments_project_entity_spec.rb'
     - 'ee/spec/serializers/vulnerabilities/finding_entity_spec.rb'
     - 'ee/spec/services/analytics/cycle_analytics/consistency_check_service_spec.rb'

.rubocop_todo/style/guard_clause.yml

@@ -86,7 +86,6 @@ Style/GuardClause:
     - 'app/models/operations/feature_flags/strategy.rb'
     - 'app/models/operations/feature_flags/user_list.rb'
     - 'app/models/packages/conan/file_metadatum.rb'
-    - 'app/models/packages/maven/metadatum.rb'
     - 'app/models/pages_domain.rb'
     - 'app/models/personal_access_token.rb'
     - 'app/models/project.rb'
@@ -161,7 +160,6 @@ Style/GuardClause:
     - 'app/services/protected_branches/legacy_api_update_service.rb'
     - 'app/services/repositories/changelog_service.rb'
     - 'app/services/snippets/repository_validation_service.rb'
-    - 'app/services/todo_service.rb'
     - 'app/services/users/build_service.rb'
     - 'app/services/wikis/create_attachment_service.rb'
     - 'app/uploaders/content_type_whitelist.rb'

.rubocop_todo/style/if_unless_modifier.yml

@@ -47,7 +47,6 @@ Style/IfUnlessModifier:
     - 'app/models/packages/conan/file_metadatum.rb'
     - 'app/models/packages/dependency.rb'
     - 'app/models/packages/go/module.rb'
-    - 'app/models/packages/maven/metadatum.rb'
     - 'app/models/pages_domain.rb'
     - 'app/models/project.rb'
     - 'app/models/project_team.rb'
@@ -317,7 +316,6 @@ Style/IfUnlessModifier:
     - 'ee/app/services/merge_trains/refresh_merge_request_service.rb'
     - 'ee/app/services/projects/mark_for_deletion_service.rb'
     - 'ee/app/services/projects/update_mirror_service.rb'
-    - 'ee/app/services/security/security_orchestration_policies/on_demand_scan_pipeline_configuration_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/policy_configuration_validation_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/process_policy_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/project_create_service.rb'

.rubocop_todo/style/inline_disable_annotation.yml

@@ -1228,7 +1228,6 @@ Style/InlineDisableAnnotation:
     - 'ee/app/services/app_sec/dast/site_tokens/find_or_create_service.rb'
     - 'ee/app/services/app_sec/dast/sites/find_or_create_service.rb'
     - 'ee/app/services/approval_rules/params_filtering_service.rb'
-    - 'ee/app/services/billable_members/destroy_service.rb'
     - 'ee/app/services/ci/minutes/additional_packs/create_service.rb'
     - 'ee/app/services/ci/minutes/refresh_cached_data_service.rb'
     - 'ee/app/services/ci/minutes/reset_usage_service.rb'

.rubocop_todo/style/super_arguments.yml

@@ -35,7 +35,6 @@ Style/SuperArguments:
     - 'app/models/current.rb'
     - 'app/models/hooks/service_hook.rb'
     - 'app/models/integrations/matrix.rb'
-    - 'app/models/integrations/telegram.rb'
     - 'app/models/issue.rb'
     - 'app/models/label.rb'
     - 'app/models/list.rb'

app/assets/javascripts/environments/components/deployment_status_badge.vue

@@ -55,5 +55,5 @@ export default {
 };
 </script>
 <template>
-  <ci-icon v-if="status" :status="statusObject" show-status-text class="!gl-border-0" />
+  <ci-icon v-if="status" :status="statusObject" show-status-text />
 </template>

app/assets/javascripts/group_settings/pipeline_variables_default_role/graphql/mutations/update_pipeline_variables_default_role_group_setting.mutation.graphql

@@ -0,0 +1,10 @@
+mutation updatePipelineVariablesDefaultRoleGroupSetting(
+  $fullPath: ID!
+  $pipelineVariablesDefaultRole: PipelineVariablesDefaultRoleType!
+) {
+  namespaceSettingsUpdate(
+    input: { fullPath: $fullPath, pipelineVariablesDefaultRole: $pipelineVariablesDefaultRole }
+  ) {
+    errors
+  }
+}

app/assets/javascripts/group_settings/pipeline_variables_default_role/graphql/queries/get_pipeline_variables_default_role_group_setting.query.graphql

@@ -0,0 +1,8 @@
+query getPipelineVariablesDefaultRoleGroupSetting($fullPath: ID!) {
+  group(fullPath: $fullPath) {
+    id
+    ciCdSettings {
+      pipelineVariablesDefaultRole
+    }
+  }
+}

app/assets/javascripts/group_settings/pipeline_variables_default_role/index.js

@@ -0,0 +1,32 @@
+import Vue from 'vue';
+import VueApollo from 'vue-apollo';
+import createDefaultClient from '~/lib/graphql';
+import PipelineVariablesDefaultRole from './pipeline_variables_default_role.vue';
+
+Vue.use(VueApollo);
+
+const apolloProvider = new VueApollo({
+  defaultClient: createDefaultClient(),
+});
+
+export default (containerId = 'js-pipeline-variables-default-role') => {
+  const containerEl = document.getElementById(containerId);
+
+  if (!containerEl) {
+    return false;
+  }
+
+  const { fullPath } = containerEl.dataset;
+
+  return new Vue({
+    el: containerEl,
+    name: 'PipelineVariablesDefaultRoleRoot',
+    apolloProvider,
+    provide: {
+      fullPath,
+    },
+    render(createElement) {
+      return createElement(PipelineVariablesDefaultRole);
+    },
+  });
+};