Add latest changes from gitlab-org/gitlab@master

hugorebelo · May 14, 2024 · 0d1ffbe · 0d1ffbe
1 parent 1847ddf
commit 0d1ffbe
Show file tree

Hide file tree

Showing 110 changed files with 438 additions and 3,166 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/.rubocop_todo/lint/deprecated_constants.yml b/.rubocop_todo/lint/deprecated_constants.yml
diff --git 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
@@ -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
@@ -1 +1 @@
-677e0ab263cf525c6e9557d33908cf55f0a13bd2
+7289808c830930bbb1009d7acc5eec458dcdf210
diff --git 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
@@ -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
@@ -303,15 +303,15 @@ 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)
       jmespath (~> 1, >= 1.6.1)
     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
@@ -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
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
@@ -24,12 +24,7 @@ export default {
 </script>
 
 <template>
-  <state-container
-    status="failed"
-    is-collapsible
-    :collapsed="mr.mergeDetailsCollapsed"
-    @toggle="() => mr.toggleMergeDetails()"
-  >
+  <state-container status="failed" is-collapsible>
     <bold-text :message="$options.message" />
   </state-container>
 </template>
diff --git a/...s/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue b/...s/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue
@@ -130,14 +130,7 @@ export default {
 };
 </script>
 <template>
-  <state-container
-    status="scheduled"
-    :is-loading="loading"
-    :actions="actions"
-    is-collapsible
-    :collapsed="mr.mergeDetailsCollapsed"
-    @toggle="() => mr.toggleMergeDetails()"
-  >
+  <state-container status="scheduled" :is-loading="loading" :actions="actions" is-collapsible>
     <template #loading>
       <gl-skeleton-loader :width="334" :height="24">
         <rect x="0" y="0" width="24" height="24" rx="4" />

diff --git a/...ts/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue b/...ts/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue
@@ -54,13 +54,7 @@ export default {
 };
 </script>
 <template>
-  <state-container
-    status="failed"
-    :actions="actions"
-    is-collapsible
-    :collapsed="mr.mergeDetailsCollapsed"
-    @toggle="() => mr.toggleMergeDetails()"
-  >
+  <state-container status="failed" :actions="actions" is-collapsible>
     <span class="gl-font-weight-bold">
       <template v-if="mergeError">{{ mergeError }}</template>
       {{ s__('mrWidget|This merge request failed to be merged automatically') }}

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
@@ -15,12 +15,7 @@ export default {
 };
 </script>
 <template>
-  <state-container
-    status="loading"
-    is-collapsible
-    :collapsed="mr.mergeDetailsCollapsed"
-    @toggle="() => mr.toggleMergeDetails()"
-  >
+  <state-container status="loading" is-collapsible>
     {{ s__('mrWidget|Checking if merge request can be merged…') }}
   </state-container>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue
@@ -79,13 +79,7 @@ export default {
 };
 </script>
 <template>
-  <state-container
-    status="closed"
-    :actions="actions"
-    is-collapsible
-    :collapsed="mr.mergeDetailsCollapsed"
-    @toggle="() => mr.toggleMergeDetails()"
-  >
+  <state-container status="closed" :actions="actions" is-collapsible>
     <mr-widget-author-time
       :action-text="s__('mrWidget|Closed by')"
       :author="mr.metrics.closedBy"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		677e0ab263cf525c6e9557d33908cf55f0a13bd2
		7289808c830930bbb1009d7acc5eec458dcdf210