From b0d6a7fbff3f97a4b2b56b672902a21e0fc29195 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 24 Feb 2023 09:09:47 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../issues/show/components/description.vue | 149 +++------------------ .../show/components/task_list_item_actions.vue | 4 +- .../branch_rules/components/branch_rule.vue | 9 +- .../repository/branch_rules/mount_branch_rules.js | 12 +- app/graphql/mutations/achievements/award.rb | 38 ++++++ .../achievements/achievements_resolver.rb | 27 ++++ .../achievements/user_achievements_resolver.rb | 33 +++++ app/graphql/types/achievements/achievement_type.rb | 6 + .../types/achievements/user_achievement_type.rb | 51 +++++++ app/graphql/types/mutation_type.rb | 1 + app/graphql/types/namespace_type.rb | 8 +- app/graphql/types/user_interface.rb | 9 ++ app/helpers/application_settings_helper.rb | 3 +- app/helpers/plan_limits_helper.rb | 28 ++++ app/models/achievements/user_achievement.rb | 2 +- app/models/application_setting.rb | 14 +- app/models/application_setting_implementation.rb | 3 +- .../achievements/user_achievement_policy.rb | 7 + app/policies/group_policy.rb | 14 +- app/services/achievements/award_service.rb | 48 +++++++ .../admin/application_settings/_ci_cd.html.haml | 18 +-- .../_projects_api_limits.html.haml | 21 +++ .../admin/application_settings/network.html.haml | 3 + .../instance_configuration/_ci_cd_limits.html.haml | 16 +-- app/views/projects/branch_rules/_show.html.haml | 5 +- ...mit_for_unauthenticated_projects_api_access.yml | 8 ++ db/fixtures/development/36_achievements.rb | 48 +++++++ ...imit_unauthenticated_to_application_settings.rb | 7 + db/schema_migrations/20230217065736 | 1 + db/structure.sql | 1 + .../geo/replication/configuration.md | 13 +- .../replication/img/adding_a_secondary_v15_8.png | Bin 0 -> 40126 bytes doc/administration/job_artifacts.md | 2 +- doc/api/graphql/reference/index.md | 75 +++++++++++ doc/api/group_level_variables.md | 2 +- doc/api/instance_level_ci_variables.md | 2 +- doc/api/job_artifacts.md | 2 +- doc/api/project_level_variables.md | 2 +- doc/api/secure_files.md | 2 +- doc/api/settings.md | 4 +- doc/api/visual_review_discussions.md | 2 +- .../ci_data_decay/pipeline_partitioning.md | 14 +- doc/ci/cloud_services/aws/index.md | 2 +- doc/ci/cloud_services/azure/index.md | 2 +- doc/ci/cloud_services/google_cloud/index.md | 2 +- doc/ci/cloud_services/index.md | 2 +- .../authenticating-with-hashicorp-vault/index.md | 2 +- .../end_to_end_testing_webdriverio/index.md | 2 +- doc/ci/introduction/index.md | 2 +- doc/ci/jobs/ci_job_token.md | 2 +- doc/ci/jobs/index.md | 2 +- doc/ci/pipelines/job_artifacts.md | 2 +- doc/ci/pipelines/pipeline_architectures.md | 2 +- doc/ci/pipelines/pipeline_artifacts.md | 2 +- doc/ci/review_apps/index.md | 2 +- doc/ci/secrets/id_token_authentication.md | 2 +- doc/ci/secrets/index.md | 2 +- doc/ci/secure_files/index.md | 2 +- doc/ci/ssh_keys/index.md | 2 +- doc/ci/testing/accessibility_testing.md | 2 +- doc/ci/testing/browser_performance_testing.md | 2 +- doc/ci/testing/fail_fast_testing.md | 2 +- doc/ci/testing/index.md | 2 +- doc/ci/testing/load_performance_testing.md | 2 +- doc/ci/testing/metrics_reports.md | 2 +- doc/ci/testing/test_coverage_visualization.md | 2 +- doc/ci/testing/unit_test_report_examples.md | 2 +- doc/ci/testing/unit_test_reports.md | 2 +- doc/ci/triggers/index.md | 2 +- doc/ci/troubleshooting.md | 2 +- doc/ci/variables/index.md | 2 +- doc/ci/variables/predefined_variables.md | 2 +- doc/ci/variables/where_variables_can_be_used.md | 2 +- doc/ci/yaml/artifacts_reports.md | 4 +- doc/user/admin_area/appearance.md | 21 +++ .../settings/rate_limit_on_projects_api.md | 33 +++++ .../application_security/vulnerabilities/index.md | 6 +- doc/user/group/repositories_analytics/index.md | 2 +- lib/api/projects.rb | 8 ++ lib/gitlab/application_rate_limiter.rb | 5 +- locale/gitlab.pot | 12 ++ spec/factories/achievements/user_achievements.rb | 14 ++ spec/features/admin/admin_settings_spec.rb | 12 ++ .../issues/show/components/description_spec.js | 146 -------------------- .../show/components/task_list_item_actions_spec.js | 2 +- spec/frontend/issues/show/mock_data/mock_data.js | 30 ----- spec/graphql/mutations/achievements/award_spec.rb | 53 ++++++++ .../achievements/achievements_resolver_spec.rb | 34 +++++ .../types/achievements/achievement_type_spec.rb | 1 + .../achievements/user_achievement_type_spec.rb | 24 ++++ spec/graphql/types/user_type_spec.rb | 1 + spec/helpers/plan_limits_helper_spec.rb | 29 ++++ spec/models/achievements/user_achievement_spec.rb | 2 +- spec/models/application_setting_spec.rb | 3 +- spec/policies/group_policy_spec.rb | 18 +++ .../achievements/user_achievements_query_spec.rb | 83 ++++++++++++ .../graphql/mutations/achievements/award_spec.rb | 106 +++++++++++++++ .../graphql/user/user_achievements_query_spec.rb | 91 +++++++++++++ spec/requests/api/projects_spec.rb | 60 +++++++++ spec/requests/api/settings_spec.rb | 5 +- spec/services/achievements/award_service_spec.rb | 73 ++++++++++ .../policies/group_policy_shared_context.rb | 1 + ...ge_request_interactions_type_shared_examples.rb | 1 + .../application_settings/network.html.haml_spec.rb | 33 +++++ 104 files changed, 1277 insertions(+), 412 deletions(-) create mode 100644 app/graphql/mutations/achievements/award.rb create mode 100644 app/graphql/resolvers/achievements/achievements_resolver.rb create mode 100644 app/graphql/resolvers/achievements/user_achievements_resolver.rb create mode 100644 app/graphql/types/achievements/user_achievement_type.rb create mode 100644 app/helpers/plan_limits_helper.rb create mode 100644 app/policies/achievements/user_achievement_policy.rb create mode 100644 app/services/achievements/award_service.rb create mode 100644 app/views/admin/application_settings/_projects_api_limits.html.haml create mode 100644 config/feature_flags/development/rate_limit_for_unauthenticated_projects_api_access.yml create mode 100644 db/fixtures/development/36_achievements.rb create mode 100644 db/migrate/20230217065736_add_projects_api_rate_limit_unauthenticated_to_application_settings.rb create mode 100644 db/schema_migrations/20230217065736 create mode 100644 doc/administration/geo/replication/img/adding_a_secondary_v15_8.png create mode 100644 doc/user/admin_area/settings/rate_limit_on_projects_api.md create mode 100644 spec/factories/achievements/user_achievements.rb create mode 100644 spec/graphql/mutations/achievements/award_spec.rb create mode 100644 spec/graphql/resolvers/achievements/achievements_resolver_spec.rb create mode 100644 spec/graphql/types/achievements/user_achievement_type_spec.rb create mode 100644 spec/helpers/plan_limits_helper_spec.rb create mode 100644 spec/requests/api/graphql/achievements/user_achievements_query_spec.rb create mode 100644 spec/requests/api/graphql/mutations/achievements/award_spec.rb create mode 100644 spec/requests/api/graphql/user/user_achievements_query_spec.rb create mode 100644 spec/services/achievements/award_service_spec.rb create mode 100644 spec/views/admin/application_settings/network.html.haml_spec.rb diff --git a/app/assets/javascripts/issues/show/components/description.vue b/app/assets/javascripts/issues/show/components/description.vue index 5682f85bc97..b36a456f41b 100644 --- a/app/assets/javascripts/issues/show/components/description.vue +++ b/app/assets/javascripts/issues/show/components/description.vue @@ -1,35 +1,26 @@