From 0d1ffbe0b6ca2611fc40df2b5489560b9bf37c74 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 14 May 2024 18:16:21 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../release-environments/main.gitlab-ci.yml | 10 + .gitlab/ci/rules.gitlab-ci.yml | 1 - .../line_continuation_leading_space.yml | 14 - .rubocop_todo/layout/line_length.yml | 3 - ...pace_inside_percent_literal_delimiters.yml | 5 - .rubocop_todo/lint/deprecated_constants.yml | 6 - .rubocop_todo/lint/unused_method_argument.yml | 1 - .rubocop_todo/rspec/feature_category.yml | 4 - GITALY_SERVER_VERSION | 2 +- Gemfile | 4 +- Gemfile.checksum | 4 +- Gemfile.lock | 8 +- .../components/filtered_search_and_sort.vue | 16 + .../components/states/merge_checks_failed.vue | 58 --- .../components/states/mr_widget_archived.vue | 7 +- .../states/mr_widget_auto_merge_enabled.vue | 9 +- .../states/mr_widget_auto_merge_failed.vue | 8 +- .../components/states/mr_widget_checking.vue | 7 +- .../components/states/mr_widget_closed.vue | 8 +- .../components/states/mr_widget_conflicts.vue | 123 ------ .../components/states/mr_widget_merged.vue | 8 +- .../states/mr_widget_not_allowed.vue | 27 -- .../states/mr_widget_pipeline_blocked.vue | 28 -- .../components/states/mr_widget_rebase.vue | 300 ------------- .../components/states/pipeline_failed.vue | 57 --- .../components/states/ready_to_merge.vue | 9 +- .../components/states/sha_mismatch.vue | 7 +- .../states/unresolved_discussions.vue | 55 --- .../components/states/work_in_progress.vue | 166 ------- .../mr_widget_options.vue | 69 +-- .../stores/get_state_key.js | 23 +- .../stores/mr_widget_store.js | 11 +- .../stores/state_maps.js | 29 -- .../projects/merge_requests_controller.rb | 1 - app/models/ci/partition.rb | 23 +- app/services/service_ping/submit_service.rb | 7 +- app/views/explore/projects/_nav.html.haml | 6 +- app/workers/gitlab_service_ping_worker.rb | 3 +- .../development/merge_blocked_component.yml | 8 - .../development/rate_limit_oauth_api.yml | 8 - config/metrics/schema/redis_hll.json | 42 -- ...agement_http_integrations_on_project_id.rb | 19 + db/schema_migrations/20240507194634 | 1 + db/structure.sql | 2 - .../static_objects_external_storage.md | 3 + .../local_setup_and_debugging.md | 8 +- .../metrics/metrics_instrumentation.md | 46 -- doc/topics/git/lfs/index.md | 6 +- doc/topics/git/lfs/troubleshooting.md | 247 +++++------ doc/user/ai_experiments.md | 20 +- doc/user/ai_features_enable.md | 26 +- doc/user/analytics/analytics_dashboards.md | 3 +- doc/user/group/manage.md | 26 -- doc/user/project/changelogs.md | 4 + doc/user/project/codeowners/index.md | 4 + .../project/merge_requests/methods/index.md | 12 + doc/user/project/repository/branches/index.md | 2 + ..._visibility_permissions_from_operations.rb | 6 +- .../security/validators/schema_validator.rb | 22 +- .../sidekiq_server_middleware.rb | 4 +- .../partitioning/ci_sliding_list_strategy.rb | 6 - .../index_helpers.rb | 4 +- .../table_management_helpers.rb | 20 +- lib/gitlab/database/postgres_partition.rb | 14 + .../importer/events/changed_reviewer.rb | 8 +- .../import_export/project/import_task.rb | 6 +- lib/gitlab/rack_attack/request.rb | 6 +- lib/gitlab/reference_counter.rb | 4 +- lib/gitlab/tracking/standard_context.rb | 4 +- lib/gitlab/usage/metrics/aggregates.rb | 8 +- .../usage/metrics/aggregates/aggregate.rb | 82 ---- .../metrics/aggregates/sources/redis_hll.rb | 26 -- .../instrumentations/aggregated_metric.rb | 57 --- locale/gitlab.pot | 48 -- qa/qa/page/merge_request/show.rb | 19 +- .../rebase_merge_request_spec.rb | 12 +- rubocop/cop/graphql/descriptions.rb | 8 +- .../migration/add_columns_to_wide_tables.rb | 4 +- .../cop/migration/background_migrations.rb | 4 +- rubocop/rubocop-usage-data.yml | 1 - scripts/lib/glfm/parse_examples.rb | 4 +- scripts/pipeline_test_report_builder.rb | 2 +- scripts/qa/testcases-check | 5 +- spec/deprecation_toolkit_env.rb | 3 +- .../user_resolves_wip_mr_spec.rb | 5 +- .../filtered_search_and_sort_spec.js | 15 + .../components/mr_widget_rebase_spec.js | 417 ------------------ .../states/merge_checks_failed_spec.js | 26 -- .../states/mr_widget_conflicts_spec.js | 315 ------------- .../states/mr_widget_not_allowed_spec.js | 25 -- .../states/mr_widget_pipeline_blocked_spec.js | 25 -- .../states/mr_widget_pipeline_failed_spec.js | 48 -- .../mr_widget_unresolved_discussions_spec.js | 55 --- .../states/work_in_progress_spec.js | 198 --------- .../mr_widget_options_spec.js | 22 +- .../stores/get_state_key_spec.js | 52 --- .../ci_sliding_list_strategy_spec.rb | 20 - .../database/postgres_partition_spec.rb | 58 +++ spec/lib/gitlab/rack_attack/request_spec.rb | 30 -- .../gitlab/usage/metric_definition_spec.rb | 12 - .../metrics/aggregates/aggregate_spec.rb | 181 -------- .../aggregates/sources/redis_hll_spec.rb | 31 -- .../aggregated_metric_spec.rb | 77 ---- .../pipeline_test_report_builder_spec.rb | 2 +- spec/services/groups/transfer_service_spec.rb | 4 +- .../submit_service_ping_service_spec.rb | 19 - .../helpers/database/duplicate_indexes.yml | 3 - spec/support/rspec_order_todo.yml | 2 - ...every_metric_definition_shared_examples.rb | 3 - .../gitlab_service_ping_worker_spec.rb | 12 +- 110 files changed, 465 insertions(+), 3193 deletions(-) delete mode 100644 .rubocop_todo/layout/space_inside_percent_literal_delimiters.yml delete mode 100644 .rubocop_todo/lint/deprecated_constants.yml delete mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue delete mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue delete mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue delete mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue delete mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue delete mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue delete mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue delete mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue delete mode 100644 config/feature_flags/development/merge_blocked_component.yml delete mode 100644 config/feature_flags/development/rate_limit_oauth_api.yml create mode 100644 db/post_migrate/20240507194634_drop_index_alert_management_http_integrations_on_project_id.rb create mode 100644 db/schema_migrations/20240507194634 delete mode 100644 lib/gitlab/usage/metrics/aggregates/aggregate.rb delete mode 100644 lib/gitlab/usage/metrics/aggregates/sources/redis_hll.rb delete mode 100644 lib/gitlab/usage/metrics/instrumentations/aggregated_metric.rb delete mode 100644 spec/frontend/vue_merge_request_widget/components/mr_widget_rebase_spec.js delete mode 100644 spec/frontend/vue_merge_request_widget/components/states/merge_checks_failed_spec.js delete mode 100644 spec/frontend/vue_merge_request_widget/components/states/mr_widget_conflicts_spec.js delete mode 100644 spec/frontend/vue_merge_request_widget/components/states/mr_widget_not_allowed_spec.js delete mode 100644 spec/frontend/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked_spec.js delete mode 100644 spec/frontend/vue_merge_request_widget/components/states/mr_widget_pipeline_failed_spec.js delete mode 100644 spec/frontend/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions_spec.js delete mode 100644 spec/frontend/vue_merge_request_widget/components/states/work_in_progress_spec.js delete mode 100644 spec/lib/gitlab/usage/metrics/aggregates/aggregate_spec.rb delete mode 100644 spec/lib/gitlab/usage/metrics/aggregates/sources/redis_hll_spec.rb delete mode 100644 spec/lib/gitlab/usage/metrics/instrumentations/aggregated_metric_spec.rb diff --git a/.gitlab/ci/release-environments/main.gitlab-ci.yml b/.gitlab/ci/release-environments/main.gitlab-ci.yml index b343fac9f60..49e7070d664 100644 --- a/.gitlab/ci/release-environments/main.gitlab-ci.yml +++ b/.gitlab/ci/release-environments/main.gitlab-ci.yml @@ -18,6 +18,10 @@ stages: - GIT_DEPTH - GIT_STRATEGY +workflow: + auto_cancel: + on_new_commit: none + variables: GIT_DEPTH: 20 GIT_STRATEGY: fetch @@ -62,11 +66,16 @@ release-environments-deploy: variables: VERSIONS: "${VERSIONS}" ENVIRONMENT: "${ENVIRONMENT}" + before_script: + # Make sure pipelines run in order + # See https://docs.gitlab.com/ee/ci/resource_groups/index.html#change-the-process-mode + - curl --request PUT --data "process_mode=oldest_first" --header "PRIVATE-TOKEN:${ENVIRONMENT_API_TOKEN}" "https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/resource_groups/release-environment-${CI_COMMIT_REF_SLUG}" trigger: project: gitlab-com/gl-infra/release-environments branch: main strategy: depend needs: ["release-environments-deploy-env"] + resource_group: release-environment-${CI_COMMIT_REF_SLUG} release-environments-qa: stage: qa @@ -80,6 +89,7 @@ release-environments-qa: GITLAB_INITIAL_ROOT_PASSWORD: "${RELEASE_ENVIRONMENTS_ROOT_PASSWORD}" QA_PRAEFECT_REPOSITORY_STORAGE: "default" SIGNUP_DISABLED: "true" + resource_group: release-environment-${CI_COMMIT_REF_SLUG} release-environments-notification-failure: stage: finish diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index b86bae48373..6e0567856f0 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -341,7 +341,6 @@ - "{,ee/,jh/}{,spec/}app/models/ci/build_trace_chunks/redis{,_base,_trace_chunks}{,_spec}.rb" - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/usage_data_counters/{hll_redis_counter,redis_counter}{,_spec}.rb" - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/usage/metrics/instrumentations/redis{_metric,hll_metric}{,_spec}.rb" - - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/usage/metrics/aggregates/sources/redis_hll{,_spec}.rb" - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/merge_requests/mergeability/redis_interface{,_spec}.rb" - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/markdown_cache/redis/*.rb" - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/redis/**/*.rb" diff --git a/.rubocop_todo/layout/line_continuation_leading_space.yml b/.rubocop_todo/layout/line_continuation_leading_space.yml index e4c5fb83593..33ea7a24cb9 100644 --- a/.rubocop_todo/layout/line_continuation_leading_space.yml +++ b/.rubocop_todo/layout/line_continuation_leading_space.yml @@ -3,18 +3,4 @@ Layout/LineContinuationLeadingSpace: Exclude: - 'ee/lib/tasks/gitlab/geo.rake' - - 'lib/gitlab/background_migration/populate_operation_visibility_permissions_from_operations.rb' - - 'lib/gitlab/ci/parsers/security/validators/schema_validator.rb' - - 'lib/gitlab/database/load_balancing/sidekiq_server_middleware.rb' - - 'lib/gitlab/database/partitioning_migration_helpers/index_helpers.rb' - - 'lib/gitlab/database/partitioning_migration_helpers/table_management_helpers.rb' - - 'lib/gitlab/github_import/importer/events/changed_reviewer.rb' - - 'lib/gitlab/import_export/project/import_task.rb' - - 'lib/gitlab/reference_counter.rb' - - 'lib/gitlab/tracking/standard_context.rb' - - 'qa/qa/specs/features/api/4_verify/api_variable_inheritance_with_forward_pipeline_variables_spec.rb' - - 'rubocop/cop/graphql/descriptions.rb' - - 'rubocop/cop/migration/add_columns_to_wide_tables.rb' - - 'rubocop/cop/migration/background_migrations.rb' - - 'scripts/lib/glfm/parse_examples.rb' - 'scripts/qa/testcases-check' diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index a614da4f470..2800eca2585 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -2645,7 +2645,6 @@ Layout/LineLength: - 'lib/gitlab/tracking/destinations/snowplow.rb' - 'lib/gitlab/tracking/event_definition.rb' - 'lib/gitlab/usage/metric_definition.rb' - - 'lib/gitlab/usage/metrics/aggregates/aggregate.rb' - 'lib/gitlab/usage/metrics/aggregates/sources/postgres_hll.rb' - 'lib/gitlab/usage/service_ping_report.rb' - 'lib/gitlab/usage_data.rb' @@ -3767,9 +3766,7 @@ Layout/LineLength: - 'spec/lib/gitlab/url_builder_spec.rb' - 'spec/lib/gitlab/usage/metric_definition_spec.rb' - 'spec/lib/gitlab/usage/metric_spec.rb' - - 'spec/lib/gitlab/usage/metrics/aggregates/aggregate_spec.rb' - 'spec/lib/gitlab/usage/metrics/aggregates/sources/postgres_hll_spec.rb' - - 'spec/lib/gitlab/usage/metrics/aggregates/sources/redis_hll_spec.rb' - 'spec/lib/gitlab/usage/metrics/instrumentations/count_users_creating_issues_metric_spec.rb' - 'spec/lib/gitlab/usage/metrics/instrumentations/database_metric_spec.rb' - 'spec/lib/gitlab/usage/metrics/instrumentations/redis_hll_metric_spec.rb' diff --git a/.rubocop_todo/layout/space_inside_percent_literal_delimiters.yml b/.rubocop_todo/layout/space_inside_percent_literal_delimiters.yml deleted file mode 100644 index 2c3744e16cb..00000000000 --- a/.rubocop_todo/layout/space_inside_percent_literal_delimiters.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# Cop supports --autocorrect. -Layout/SpaceInsidePercentLiteralDelimiters: - Exclude: - - 'spec/deprecation_toolkit_env.rb' diff --git a/.rubocop_todo/lint/deprecated_constants.yml b/.rubocop_todo/lint/deprecated_constants.yml deleted file mode 100644 index 644158311d7..00000000000 --- a/.rubocop_todo/lint/deprecated_constants.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# Cop supports --autocorrect. -Lint/DeprecatedConstants: - Exclude: - - 'scripts/pipeline_test_report_builder.rb' - - 'spec/scripts/pipeline_test_report_builder_spec.rb' diff --git a/.rubocop_todo/lint/unused_method_argument.yml b/.rubocop_todo/lint/unused_method_argument.yml index c23f70d090f..541422c16ed 100644 --- a/.rubocop_todo/lint/unused_method_argument.yml +++ b/.rubocop_todo/lint/unused_method_argument.yml @@ -506,7 +506,6 @@ Lint/UnusedMethodArgument: - 'lib/gitlab/testing/robots_blocker_middleware.rb' - 'lib/gitlab/tracking.rb' - 'lib/gitlab/untrusted_regexp/ruby_syntax.rb' - - 'lib/gitlab/usage/metrics/aggregates/sources/redis_hll.rb' - 'lib/gitlab/usage_data.rb' - 'lib/gitlab/usage_data_non_sql_metrics.rb' - 'lib/gitlab/usage_data_queries.rb' diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml index 1117d2db245..4cb7ee60ad5 100644 --- a/.rubocop_todo/rspec/feature_category.yml +++ b/.rubocop_todo/rspec/feature_category.yml @@ -617,7 +617,6 @@ RSpec/FeatureCategory: - 'ee/spec/lib/ee/gitlab/snippet_search_results_spec.rb' - 'ee/spec/lib/ee/gitlab/template/gitlab_ci_yml_template_spec.rb' - 'ee/spec/lib/ee/gitlab/url_builder_spec.rb' - - 'ee/spec/lib/ee/gitlab/usage/metrics/aggregates/aggregate_spec.rb' - 'ee/spec/lib/ee/gitlab/usage/service_ping/payload_keys_processor_spec.rb' - 'ee/spec/lib/ee/gitlab/usage_data_counters/issue_activity_unique_counter_spec.rb' - 'ee/spec/lib/ee/gitlab/usage_data_counters/merge_request_activity_unique_counter_spec.rb' @@ -3921,11 +3920,8 @@ RSpec/FeatureCategory: - 'spec/lib/gitlab/url_sanitizer_spec.rb' - 'spec/lib/gitlab/usage/metric_definition_spec.rb' - 'spec/lib/gitlab/usage/metric_spec.rb' - - 'spec/lib/gitlab/usage/metrics/aggregates/aggregate_spec.rb' - 'spec/lib/gitlab/usage/metrics/aggregates/sources/postgres_hll_spec.rb' - - 'spec/lib/gitlab/usage/metrics/aggregates/sources/redis_hll_spec.rb' - 'spec/lib/gitlab/usage/metrics/instrumentations/active_user_count_metric_spec.rb' - - 'spec/lib/gitlab/usage/metrics/instrumentations/aggregated_metric_spec.rb' - 'spec/lib/gitlab/usage/metrics/instrumentations/cert_based_clusters_ff_metric_spec.rb' - 'spec/lib/gitlab/usage/metrics/instrumentations/collected_data_categories_metric_spec.rb' - 'spec/lib/gitlab/usage/metrics/instrumentations/count_boards_metric_spec.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 89792d2a0fd..ae017839112 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -677e0ab263cf525c6e9557d33908cf55f0a13bd2 +7289808c830930bbb1009d7acc5eec458dcdf210 diff --git a/Gemfile b/Gemfile index 5e2c688e8cd..bddc7d40a49 100644 --- a/Gemfile +++ b/Gemfile @@ -203,9 +203,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-core', '~> 3.194.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.196.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.149.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.150.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/Gemfile.checksum b/Gemfile.checksum index 68c79524624..e269b05c481 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -36,9 +36,9 @@ {"name":"aws-eventstream","version":"1.3.0","platform":"ruby","checksum":"f1434cc03ab2248756eb02cfa45e900e59a061d7fbdc4a9fd82a5dd23d796d3f"}, {"name":"aws-partitions","version":"1.877.0","platform":"ruby","checksum":"9552ed7bbd3700ed1eeb0121c160ceaf64fa5dbaff5a1ff5fe6fd8481ecd9cfd"}, {"name":"aws-sdk-cloudformation","version":"1.41.0","platform":"ruby","checksum":"31e47539719734413671edf9b1a31f8673fbf9688549f50c41affabbcb1c6b26"}, -{"name":"aws-sdk-core","version":"3.194.2","platform":"ruby","checksum":"f925fb739cd093e5834910aed85aba5ac8d1b210f26c2cf51f0daf932cc77567"}, +{"name":"aws-sdk-core","version":"3.196.0","platform":"ruby","checksum":"a9a8ce8cc133eb80ba6e78c4eb3f2a04b7c74d79962ad7b24e7f5d803ee717a1"}, {"name":"aws-sdk-kms","version":"1.76.0","platform":"ruby","checksum":"e7f75013cba9ba357144f66bbc600631c192e2cda9dd572794be239654e2cf49"}, -{"name":"aws-sdk-s3","version":"1.149.1","platform":"ruby","checksum":"664e608190d42b486dc79b5dc65e7c2240923902a9833063327a9d831226a46a"}, +{"name":"aws-sdk-s3","version":"1.150.0","platform":"ruby","checksum":"1ce0d42f6c53de4244e457d92296da53bfbd12e716b50d2fa851255fe936c82c"}, {"name":"aws-sigv4","version":"1.8.0","platform":"ruby","checksum":"84dd99768b91b93b63d1d8e53ee837cfd06ab402812772a7899a78f9f9117cbc"}, {"name":"axe-core-api","version":"4.8.0","platform":"ruby","checksum":"88cf44fdbd5d501ae429f9ca6b37c4a46ba27ac673d478ab688eea3e353da62f"}, {"name":"axe-core-rspec","version":"4.9.0","platform":"ruby","checksum":"e5f81fa55af0c421254c98476511c4511e193c5659996f184541f74a1359df3a"}, diff --git a/Gemfile.lock b/Gemfile.lock index c9c44871da5..717697b40ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,7 +303,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.194.2) + aws-sdk-core (3.196.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -311,7 +311,7 @@ GEM aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.149.1) + aws-sdk-s3 (1.150.0) aws-sdk-core (~> 3, >= 3.194.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) @@ -1921,8 +1921,8 @@ DEPENDENCIES attr_encrypted (~> 3.2.4)! awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.194.2) - aws-sdk-s3 (~> 1.149.1) + aws-sdk-core (~> 3.196.0) + aws-sdk-s3 (~> 1.150.0) axe-core-rspec (~> 4.9.0) babosa (~> 2.0) base32 (~> 0.3.0) diff --git a/app/assets/javascripts/projects/explore/components/filtered_search_and_sort.vue b/app/assets/javascripts/projects/explore/components/filtered_search_and_sort.vue index 0247dfb053a..f88f6bfcd55 100644 --- a/app/assets/javascripts/projects/explore/components/filtered_search_and_sort.vue +++ b/app/assets/javascripts/projects/explore/components/filtered_search_and_sort.vue @@ -5,6 +5,7 @@ import FilteredSearchAndSort from '~/groups_projects/components/filtered_search_ import { RECENT_SEARCHES_STORAGE_KEY_PROJECTS } from '~/filtered_search/recent_searches_storage_keys'; import { queryToObject, objectToQuery, visitUrl } from '~/lib/utils/url_utility'; import { OPERATORS_IS } from '~/vue_shared/components/filtered_search_bar/constants'; +import { ACCESS_LEVEL_OWNER_INTEGER } from '~/access_level/constants'; import { SORT_OPTIONS, SORT_DIRECTION_ASC, @@ -41,6 +42,21 @@ export default { title: name, })), }, + { + type: 'min_access_level', + icon: 'user', + title: __('Role'), + token: GlFilteredSearchToken, + unique: true, + operators: OPERATORS_IS, + options: [ + { + // Cast to string so it matches value from query string + value: ACCESS_LEVEL_OWNER_INTEGER.toString(), + title: __('Owner'), + }, + ], + }, ]; }, queryAsObject() { diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue deleted file mode 100644 index 5eab7c9994b..00000000000 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue index 722efe2e6d2..eaa21702077 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue @@ -24,12 +24,7 @@ export default { diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue index ec72b74daa2..a5dc540355e 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue @@ -130,14 +130,7 @@ export default { };