diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 572e873426c..0a9f5bfad43 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -523,7 +523,6 @@ lib/gitlab/checks/** /doc/administration/audit_event_reports.md @eread /doc/administration/audit_event_schema.md @eread /doc/administration/audit_event_streaming/ @eread -/doc/administration/audit_event_types.md @eread /doc/administration/auditor_users.md @jglassman1 /doc/administration/auth/ @jglassman1 /doc/administration/backup_restore/ @axil @@ -885,6 +884,7 @@ lib/gitlab/checks/** /doc/integration/jira/ @eread @ashrafkhamis /doc/integration/mattermost/ @axil /doc/integration/partner_marketplace.md @fneill +/doc/integration/snowflake.md @eread /doc/integration/sourcegraph.md @msedlakjakubowski /doc/integration/trello_power_up.md @eread @ashrafkhamis /doc/integration/vault.md @phillipwells diff --git a/.gitlab/ci/as-if-foss.gitlab-ci.yml b/.gitlab/ci/as-if-foss.gitlab-ci.yml index cdff908b458..70f5450cf3e 100644 --- a/.gitlab/ci/as-if-foss.gitlab-ci.yml +++ b/.gitlab/ci/as-if-foss.gitlab-ci.yml @@ -95,6 +95,7 @@ start-as-if-foss: ENABLE_GRAPHQL_SCHEMA_DUMP: $ENABLE_GRAPHQL_SCHEMA_DUMP ENABLE_JEST: $ENABLE_JEST ENABLE_JEST_INTEGRATION: $ENABLE_JEST_INTEGRATION + ENABLE_JEST_PREDICTIVE: $ENABLE_JEST_PREDICTIVE ENABLE_RSPEC_PREDICTIVE_PIPELINE_GENERATE: $ENABLE_RSPEC_PREDICTIVE_PIPELINE_GENERATE ENABLE_RSPEC_PREDICTIVE_TRIGGER: $ENABLE_RSPEC_PREDICTIVE_TRIGGER ENABLE_RSPEC_PREDICTIVE_TRIGGER_SINGLE_DB: $ENABLE_RSPEC_PREDICTIVE_TRIGGER_SINGLE_DB diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 55311c4d7a0..abb18402ab5 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -77,12 +77,6 @@ compile-test-assets: - "${WEBPACK_COMPILE_LOG_PATH}" when: always -compile-test-assets as-if-foss: - extends: - - compile-test-assets - - .frontend:rules:compile-test-assets-as-if-foss - - .as-if-foss - update-assets-compile-production-cache: extends: - compile-production-assets @@ -180,23 +174,6 @@ rspec-all frontend_fixture: - "compile-test-assets" parallel: 7 -# Builds FOSS fixtures in the EE project, with the `ee/` folder removed (due to `as-if-foss`). -rspec-all frontend_fixture as-if-foss: - extends: - - .frontend-fixtures-base - - .frontend:rules:frontend_fixture-as-if-foss - - .as-if-foss - variables: - # We explicitly disable Crystalball here so as even in scheduled pipelines we don't need it - # since it's already enabled for `rspec-all frontend_fixture` there. - CRYSTALBALL: "false" - WEBPACK_VENDOR_DLL: "true" - KNAPSACK_GENERATE_REPORT: "" - FLAKY_RSPEC_GENERATE_REPORT: "" - needs: - - !reference [.frontend-fixtures-base, needs] - - "compile-test-assets as-if-foss" - # Uploads EE fixtures in the EE project. # Uploads FOSS fixtures in the FOSS project. upload-frontend-fixtures: @@ -357,15 +334,6 @@ jest predictive: script: - if [[ -s "$RSPEC_CHANGED_FILES_PATH" ]] || [[ -s "$RSPEC_MATCHING_JS_FILES_PATH" ]]; then run_timed_command "yarn jest:ci:predictive"; fi -jest predictive as-if-foss: - extends: - - jest predictive - - .frontend:rules:jest:predictive-as-if-foss - - .as-if-foss - needs: - - "rspec-all frontend_fixture as-if-foss" - - "detect-tests" - jest-integration: extends: - .frontend-test-base diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 9835ad088ba..03934f4ce51 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -408,9 +408,6 @@ .frontend-predictive-patterns: &frontend-predictive-patterns - "{,ee/,jh/}{app/assets/javascripts,spec/frontend}/**/*" -.frontend-predictive-patterns-as-if-foss: &frontend-predictive-patterns-as-if-foss - - "{app/assets/javascripts,spec/frontend}/**/*" - # Frontend view patterns + .qa-patterns .frontend-qa-patterns: &frontend-qa-patterns - "{,ee/,jh/}{app/assets,app/components,app/helpers,app/presenters,app/views}/**/*" @@ -1259,17 +1256,6 @@ - <<: *if-default-refs changes: *workhorse-patterns -.frontend:rules:compile-test-assets-as-if-foss: - rules: - - !reference [".strict-ee-only-rules", rules] - - <<: *if-merge-request-labels-as-if-foss - - <<: *if-merge-request-labels-run-all-rspec - - <<: *if-merge-request-labels-frontend-and-feature-flag - - <<: *if-default-refs - changes: *code-backstage-qa-patterns - - <<: *if-default-refs - changes: *workhorse-patterns - .frontend:rules:default-frontend-jobs: rules: - <<: *if-merge-request-labels-pipeline-expedite @@ -1336,20 +1322,6 @@ - <<: *if-default-refs changes: *code-backstage-patterns -.frontend:rules:frontend_fixture-as-if-foss: - rules: - - !reference [".strict-ee-only-rules", rules] - - <<: *if-merge-request-labels-pipeline-expedite - when: never - - <<: *if-merge-request-labels-as-if-foss - - <<: *if-merge-request-labels-run-all-rspec - - <<: *if-merge-request-labels-run-all-jest - - <<: *if-merge-request-labels-frontend-and-feature-flag - - <<: *if-security-merge-request - changes: *code-backstage-patterns - - <<: *if-merge-request - changes: *frontend-predictive-patterns-as-if-foss - .frontend:rules:upload-frontend-fixtures: rules: # The new strategy to upload fixtures as generic packages is experimental and can be disabled by removing the `REUSE_FRONTEND_FIXTURES_ENABLED` variable @@ -1402,6 +1374,7 @@ - <<: *if-merge-request changes: *frontend-dependency-patterns when: never + - if: '$ENABLE_JEST_PREDICTIVE == "true"' - <<: *if-merge-request changes: [".gitlab/ci/frontend.gitlab-ci.yml"] # When this file is modified, we run full Jest jobs when: never @@ -1426,20 +1399,6 @@ - <<: *if-default-refs changes: *code-backstage-patterns -.frontend:rules:jest:predictive-as-if-foss: - rules: - - !reference [".strict-ee-only-rules", rules] - - !reference [".frontend:rules:predictive-default-rules", rules] - - <<: *if-merge-request-labels-as-if-foss - when: never - - <<: *if-merge-request - changes: *frontend-dependency-patterns - when: never - - <<: *if-fork-merge-request - when: never - - <<: *if-merge-request - changes: *frontend-predictive-patterns-as-if-foss - .frontend:rules:coverage-frontend: rules: - <<: *if-not-ee @@ -2386,7 +2345,6 @@ - <<: *if-merge-request changes: *rubocop-patterns - .rails:rules:detect-previous-failed-tests: rules: - !reference [".rails:rules:previous-failed-tests-default-rules", rules] diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml index 6eeb2c26974..bddc27e5bce 100644 --- a/.rubocop_todo/layout/argument_alignment.yml +++ b/.rubocop_todo/layout/argument_alignment.yml @@ -164,19 +164,6 @@ Layout/ArgumentAlignment: - 'lib/api/project_container_repositories.rb' - 'lib/api/project_export.rb' - 'lib/api/project_import.rb' - - 'lib/api/project_packages.rb' - - 'lib/api/project_snippets.rb' - - 'lib/api/project_templates.rb' - - 'lib/api/projects.rb' - - 'lib/api/protected_branches.rb' - - 'lib/api/protected_tags.rb' - - 'lib/api/releases.rb' - - 'lib/api/remote_mirrors.rb' - - 'lib/api/repositories.rb' - - 'lib/api/resource_access_tokens.rb' - - 'lib/api/settings.rb' - - 'lib/api/snippets.rb' - - 'lib/api/system_hooks.rb' - 'lib/api/tags.rb' - 'lib/api/terraform/state.rb' - 'lib/api/topics.rb' @@ -294,19 +281,6 @@ Layout/ArgumentAlignment: - 'spec/lib/gitlab/middleware/multipart_spec.rb' - 'spec/lib/gitlab/pagination_delegate_spec.rb' - 'spec/lib/gitlab/path_regex_spec.rb' - - 'spec/lib/gitlab/profiler_spec.rb' - - 'spec/lib/gitlab/repository_cache/preloader_spec.rb' - - 'spec/lib/gitlab/repository_cache_spec.rb' - - 'spec/lib/gitlab/search_context/builder_spec.rb' - - 'spec/lib/gitlab/seeders/ci/runner/runner_fleet_seeder_spec.rb' - - 'spec/lib/gitlab/sidekiq_config_spec.rb' - - 'spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb' - - 'spec/lib/gitlab/sidekiq_migrate_jobs_spec.rb' - - 'spec/lib/gitlab/sidekiq_queue_spec.rb' - - 'spec/lib/gitlab/slash_commands/command_spec.rb' - - 'spec/lib/gitlab/slash_commands/deploy_spec.rb' - - 'spec/lib/gitlab/slash_commands/issue_move_spec.rb' - - 'spec/lib/gitlab/spamcheck/client_spec.rb' - 'spec/lib/gitlab/suggestions/commit_message_spec.rb' - 'spec/lib/gitlab/suggestions/file_suggestion_spec.rb' - 'spec/lib/gitlab/suggestions/suggestion_set_spec.rb' diff --git a/.rubocop_todo/lint/symbol_conversion.yml b/.rubocop_todo/lint/symbol_conversion.yml index c400ccf8aaa..7261898a7ae 100644 --- a/.rubocop_todo/lint/symbol_conversion.yml +++ b/.rubocop_todo/lint/symbol_conversion.yml @@ -131,27 +131,12 @@ Lint/SymbolConversion: - 'spec/lib/api/entities/nuget/search_result_spec.rb' - 'spec/lib/api/helpers/rate_limiter_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/project_feature_pipeline_spec.rb' - - 'spec/lib/google_api/cloud_platform/client_spec.rb' - - 'spec/lib/service_ping/devops_report_spec.rb' - 'spec/models/appearance_spec.rb' - 'spec/models/concerns/file_store_mounter_spec.rb' - 'spec/models/concerns/project_features_compatibility_spec.rb' - - 'spec/models/integrations/prometheus_spec.rb' - - 'spec/models/merge_request_diff_commit_spec.rb' - 'spec/models/plan_spec.rb' - 'spec/models/project_feature_spec.rb' - 'spec/policies/project_policy_spec.rb' - - 'spec/requests/api/admin/plan_limits_spec.rb' - - 'spec/requests/api/ci/job_artifacts_spec.rb' - - 'spec/requests/api/ci/runner/jobs_put_spec.rb' - - 'spec/requests/api/feature_flags_spec.rb' - - 'spec/requests/api/group_debian_distributions_spec.rb' - - 'spec/requests/api/integrations_spec.rb' - - 'spec/requests/api/maven_packages_spec.rb' - - 'spec/requests/api/project_debian_distributions_spec.rb' - - 'spec/requests/api/terraform/state_spec.rb' - - 'spec/requests/mailgun/webhooks_controller_spec.rb' - - 'spec/requests/users_controller_spec.rb' - 'spec/services/ci/job_artifacts/expire_project_build_artifacts_service_spec.rb' - 'spec/services/concerns/rate_limited_service_spec.rb' - 'spec/services/design_management/copy_design_collection/copy_service_spec.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 1ded6908a18..a18b2da5009 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -b98431224ef98fdd8186cc01c064708e4bceb419 +ac01cedc82a0e1c1a049f59633f61e5e2ad0ee98 diff --git a/app/assets/javascripts/admin/users/components/user_actions.vue b/app/assets/javascripts/admin/users/components/user_actions.vue index a9482d479b6..97b29a9df28 100644 --- a/app/assets/javascripts/admin/users/components/user_actions.vue +++ b/app/assets/javascripts/admin/users/components/user_actions.vue @@ -91,7 +91,7 @@ export default {