.gitlab/ci/rails.gitlab-ci.yml

@@ -257,17 +257,6 @@ static-analysis:
     - run_timed_command "retry yarn install --frozen-lockfile"
     - scripts/static-analysis
 
-downtime_check:
-  extends:
-    - .rails-job-base
-    - .rails:rules:downtime_check
-  needs: []
-  stage: test
-  variables:
-    SETUP_DB: "false"
-  script:
-    - bundle exec rake downtime_check
-
 rspec migration pg11:
   extends:
     - .rspec-base-pg11
@@ -802,7 +791,7 @@ fail-pipeline-early:
     GIT_DEPTH: 1
   before_script:
     - source scripts/utils.sh
-    - install_api_client_dependencies_with_apt
+    - install_gitlab_gem
   script:
     - fail_pipeline_early
 # EE: Canonical MR pipelines

.gitlab/ci/review.gitlab-ci.yml

@@ -29,7 +29,6 @@ review-build-cng:
   stage: review-prepare
   before_script:
     - source ./scripts/utils.sh
-    - install_api_client_dependencies_with_apk
     - install_gitlab_gem
   needs:
     - job: compile-production-assets

.gitlab/ci/rules.gitlab-ci.yml

@@ -880,11 +880,6 @@
       changes: *code-backstage-patterns
       when: on_failure
 
-.rails:rules:downtime_check:
-  rules:
-    - <<: *if-merge-request
-      changes: *code-backstage-patterns
-
 .rails:rules:deprecations:
   rules:
     - <<: *if-not-ee

.gitlab/issue_templates/Feature Flag Roll Out.md

@@ -34,7 +34,7 @@ Are there any other stages or teams involved that need to be kept in the loop?
     If it is possible to perform an incremental rollout, this should be preferred. Proposed increments are: `10%`, `50%`, `100%`. Proposed minimum time between increments is 15 minutes.
 - [ ] Rollout Feature for everyone as soon as it's ready
 
-<!-- Which dashboards from https://dashboards.gitlab.net are most relevant? Sentry errors reports can alse be useful to review -->
+<!-- Which dashboards from https://dashboards.gitlab.net are most relevant? Sentry errors reports can also be useful to review -->
 
 **Beta Groups/Projects:**
 <!-- If applicable, any groups/projects that are happy to have this feature turned on early. Some organizations may wish to test big changes they are interested in with a small subset of users ahead of time for example. -->
@@ -64,17 +64,13 @@ Are there any other stages or teams involved that need to be kept in the loop?
 
 **Initial Rollout**
 
-*Preperation Phase*
+*Preparation Phase*
 - [ ] Enable on staging (`/chatops run feature set feature_name true --staging`)
 
 - [ ] Test on staging
 
 - [ ] Ensure that documentation has been updated ([More info](https://docs.gitlab.com/ee/development/documentation/feature_flags.html#features-that-became-enabled-by-default))
 
-- [ ] Coordinate a time to enable the flag with the SRE oncall and release managers
-  - In `#production` by pinging `@sre-oncall`
-  - In `#g_delivery` by pinging `@release-managers`
-
 - [ ] Announce on the issue an estimated time this will be enabled on GitLab.com
 
 *Partial Rollout Phase*

.gitlab/issue_templates/experiment_tracking_template.md

@@ -27,7 +27,7 @@ As well as defining the experiment rollout and cleanup, this issue incorporates
 ### What might happen if this goes wrong?
 
 ### What can we monitor to detect problems with this?
-<!-- Which dashboards from https://dashboards.gitlab.net are most relevant? Sentry errors reports can alse be useful to review -->
+<!-- Which dashboards from https://dashboards.gitlab.net are most relevant? Sentry errors reports can also be useful to review -->
 
 ### Tracked data
 <!-- brief description or link to issue or Sisense dashboard -->

.haml-lint.yml

@@ -111,7 +111,6 @@ linters:
       - Layout/EmptyLineAfterGuardClause
       - Layout/LeadingCommentSpace
       - Layout/SpaceAfterColon
-      - Layout/SpaceAfterComma
       - Layout/SpaceAroundOperators
       - Layout/SpaceBeforeBlockBraces
       - Layout/SpaceBeforeComma

.rubocop_manual_todo.yml

@@ -97,26 +97,6 @@ Rails/SaveBang:
     - 'ee/spec/models/visible_approvable_spec.rb'
     - 'ee/spec/models/vulnerabilities/feedback_spec.rb'
     - 'ee/spec/models/vulnerabilities/issue_link_spec.rb'
-    - 'ee/spec/requests/api/boards_spec.rb'
-    - 'ee/spec/requests/api/epic_issues_spec.rb'
-    - 'ee/spec/requests/api/epic_links_spec.rb'
-    - 'ee/spec/requests/api/epics_spec.rb'
-    - 'ee/spec/requests/api/geo_nodes_spec.rb'
-    - 'ee/spec/requests/api/geo_spec.rb'
-    - 'ee/spec/requests/api/graphql/group/epics_spec.rb'
-    - 'ee/spec/requests/api/graphql/mutations/epic_tree/reorder_spec.rb'
-    - 'ee/spec/requests/api/groups_spec.rb'
-    - 'ee/spec/requests/api/issues_spec.rb'
-    - 'ee/spec/requests/api/ldap_group_links_spec.rb'
-    - 'ee/spec/requests/api/merge_request_approval_rules_spec.rb'
-    - 'ee/spec/requests/api/merge_request_approvals_spec.rb'
-    - 'ee/spec/requests/api/merge_requests_spec.rb'
-    - 'ee/spec/requests/api/project_approvals_spec.rb'
-    - 'ee/spec/requests/api/projects_spec.rb'
-    - 'ee/spec/requests/api/protected_branches_spec.rb'
-    - 'ee/spec/requests/api/scim_spec.rb'
-    - 'ee/spec/requests/api/todos_spec.rb'
-    - 'ee/spec/requests/lfs_http_spec.rb'
     - 'ee/spec/services/approval_rules/finalize_service_spec.rb'
     - 'ee/spec/services/approval_rules/update_service_spec.rb'
     - 'ee/spec/services/ee/boards/issues/create_service_spec.rb'
@@ -177,27 +157,11 @@ Rails/SaveBang:
     - 'spec/controllers/sent_notifications_controller_spec.rb'
     - 'spec/controllers/sessions_controller_spec.rb'
     - 'spec/factories_spec.rb'
-    - 'spec/features/dashboard/datetime_on_tooltips_spec.rb'
-    - 'spec/features/dashboard/issuables_counter_spec.rb'
-    - 'spec/features/dashboard/project_member_activity_index_spec.rb'
-    - 'spec/features/dashboard/projects_spec.rb'
-    - 'spec/features/issues/bulk_assignment_labels_spec.rb'
-    - 'spec/features/issues/gfm_autocomplete_spec.rb'
-    - 'spec/features/issues/issue_sidebar_spec.rb'
-    - 'spec/features/issues/note_polling_spec.rb'
-    - 'spec/features/issues/user_creates_branch_and_merge_request_spec.rb'
-    - 'spec/features/issues/user_creates_confidential_merge_request_spec.rb'
-    - 'spec/features/issues/user_edits_issue_spec.rb'
-    - 'spec/features/issues/user_filters_issues_spec.rb'
-    - 'spec/features/issues/user_sees_live_update_spec.rb'
-    - 'spec/features/issues/user_sorts_issues_spec.rb'
     - 'spec/frontend/fixtures/issues.rb'
     - 'spec/frontend/fixtures/merge_requests.rb'
     - 'spec/graphql/mutations/merge_requests/set_locked_spec.rb'
     - 'spec/graphql/mutations/merge_requests/set_wip_spec.rb'
     - 'spec/graphql/resolvers/boards_resolver_spec.rb'
-    - 'spec/initializers/active_record_locking_spec.rb'
-    - 'spec/initializers/fog_google_https_private_urls_spec.rb'
     - 'spec/lib/after_commit_queue_spec.rb'
     - 'spec/lib/backup/manager_spec.rb'
     - 'spec/lib/gitlab/alerting/alert_spec.rb'
@@ -252,8 +216,6 @@ Rails/SaveBang:
     - 'spec/models/application_record_spec.rb'
     - 'spec/models/application_setting_spec.rb'
     - 'spec/models/clusters/applications/helm_spec.rb'
-    - 'spec/models/commit_spec.rb'
-    - 'spec/models/commit_status_spec.rb'
     - 'spec/models/container_repository_spec.rb'
     - 'spec/models/design_management/version_spec.rb'
     - 'spec/models/diff_discussion_spec.rb'
@@ -266,8 +228,6 @@ Rails/SaveBang:
     - 'spec/models/grafana_integration_spec.rb'
     - 'spec/models/group_spec.rb'
     - 'spec/models/identity_spec.rb'
-    - 'spec/models/issue/metrics_spec.rb'
-    - 'spec/models/issue_spec.rb'
     - 'spec/models/jira_import_state_spec.rb'
     - 'spec/models/key_spec.rb'
     - 'spec/models/lfs_objects_project_spec.rb'
@@ -302,23 +262,6 @@ Rails/SaveBang:
     - 'spec/models/user_status_spec.rb'
     - 'spec/models/wiki_page/meta_spec.rb'
     - 'spec/models/wiki_page_spec.rb'
-    - 'spec/requests/api/ci/runner_spec.rb'
-    - 'spec/requests/api/commit_statuses_spec.rb'
-    - 'spec/requests/api/conan_packages_spec.rb'
-    - 'spec/requests/api/deployments_spec.rb'
-    - 'spec/requests/api/environments_spec.rb'
-    - 'spec/requests/api/go_proxy_spec.rb'
-    - 'spec/requests/api/graphql/mutations/merge_requests/set_labels_spec.rb'
-    - 'spec/requests/api/graphql/user_query_spec.rb'
-    - 'spec/requests/api/graphql_spec.rb'
-    - 'spec/requests/api/group_import_spec.rb'
-    - 'spec/requests/api/group_milestones_spec.rb'
-    - 'spec/requests/api/internal/base_spec.rb'
-    - 'spec/requests/api/issues/get_group_issues_spec.rb'
-    - 'spec/requests/api/issues/post_projects_issues_spec.rb'
-    - 'spec/requests/api/jobs_spec.rb'
-    - 'spec/requests/api/labels_spec.rb'
-    - 'spec/requests/api/project_import_spec.rb'
 
 Rails/TimeZone:
   Enabled: true
@@ -584,48 +527,11 @@ RSpec/EmptyLineAfterFinalLetItBe:
     - ee/spec/lib/gitlab/elastic/document_reference_spec.rb
     - ee/spec/lib/gitlab/elastic/group_search_results_spec.rb
     - ee/spec/lib/gitlab/elastic/project_search_results_spec.rb
-    - ee/spec/lib/gitlab/geo/geo_tasks_spec.rb
-    - ee/spec/lib/gitlab/geo/log_cursor/daemon_spec.rb
-    - ee/spec/lib/gitlab/geo/log_cursor/events/container_repository_updated_event_spec.rb
-    - ee/spec/lib/gitlab/geo/log_cursor/events/design_repository_updated_event_spec.rb
-    - ee/spec/lib/gitlab/geo/log_cursor/events/repositories_changed_event_spec.rb
-    - ee/spec/lib/gitlab/geo/log_cursor/events/repository_created_event_spec.rb
-    - ee/spec/lib/gitlab/geo/log_cursor/events/repository_updated_event_spec.rb
-    - ee/spec/lib/gitlab/geo/replication/base_transfer_spec.rb
-    - ee/spec/lib/gitlab/geo/replication/blob_downloader_spec.rb
-    - ee/spec/lib/gitlab/geo/replication/file_transfer_spec.rb
     - ee/spec/lib/gitlab/git_access_spec.rb
     - ee/spec/lib/gitlab/git_access_wiki_spec.rb
     - ee/spec/lib/gitlab/graphql/aggregations/vulnerability_statistics/lazy_aggregate_spec.rb
     - ee/spec/lib/gitlab/insights/project_insights_config_spec.rb
     - ee/spec/lib/gitlab/sitemaps/url_extractor_spec.rb
-    - ee/spec/mailers/credentials_inventory_mailer_spec.rb
-    - ee/spec/mailers/ee/emails/profile_spec.rb
-    - ee/spec/mailers/notify_spec.rb
-    - ee/spec/migrations/backfill_version_author_and_created_at_spec.rb
-    - ee/spec/models/analytics/cycle_analytics/group_level_spec.rb
-    - ee/spec/models/burndown_spec.rb
-    - ee/spec/models/ci/build_spec.rb
-    - ee/spec/models/ci/daily_build_group_report_result_spec.rb
-    - ee/spec/models/ci/minutes/notification_spec.rb
-    - ee/spec/models/concerns/epic_tree_sorting_spec.rb
-    - ee/spec/models/dora/daily_metrics_spec.rb
-    - ee/spec/models/ee/ci/build_dependencies_spec.rb
-    - ee/spec/models/ee/iteration_spec.rb
-    - ee/spec/models/ee/namespace/root_storage_size_spec.rb
-    - ee/spec/models/ee/namespace_spec.rb
-    - ee/spec/models/ee/personal_access_token_spec.rb
-    - ee/spec/models/epic_spec.rb
-    - ee/spec/models/geo/lfs_object_registry_spec.rb
-    - ee/spec/models/gitlab_subscription_spec.rb
-    - ee/spec/models/group_member_spec.rb
-    - ee/spec/models/instance_security_dashboard_spec.rb
-    - ee/spec/models/issue_spec.rb
-    - ee/spec/models/label_note_spec.rb
-    - ee/spec/models/merge_request_spec.rb
-    - ee/spec/models/project_spec.rb
-    - ee/spec/models/requirements_management/test_report_spec.rb
-    - ee/spec/models/vulnerabilities/finding_spec.rb
     - ee/spec/policies/clusters/agent_token_policy_spec.rb
     - ee/spec/policies/compliance_management/framework_policy_spec.rb
     - ee/spec/policies/group_policy_spec.rb
@@ -690,32 +596,9 @@ RSpec/EmptyLineAfterFinalLetItBe:
     - ee/spec/requests/api/wikis_spec.rb
     - ee/spec/requests/callout_spec.rb
     - ee/spec/requests/git_http_geo_spec.rb
-    - ee/spec/requests/projects/issues_controller_spec.rb
-    - ee/spec/requests/projects/on_demand_scans_controller_spec.rb
-    - ee/spec/requests/projects/security/scanned_resources_controller_spec.rb
     - ee/spec/requests/repositories/git_http_controller_spec.rb
-    - ee/spec/serializers/clusters/environment_serializer_spec.rb
-    - ee/spec/serializers/dependency_entity_spec.rb
-    - ee/spec/serializers/dependency_list_serializer_spec.rb
-    - 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/member_entity_spec.rb
-    - ee/spec/serializers/merge_request_poll_widget_entity_spec.rb
-    - ee/spec/serializers/merge_request_widget_entity_spec.rb
-    - ee/spec/serializers/status_page/incident_comment_entity_spec.rb
-    - ee/spec/serializers/vulnerabilities/feedback_entity_spec.rb
     - ee/spec/services/alert_management/extract_alert_payload_fields_service_spec.rb
     - ee/spec/services/alert_management/process_prometheus_alert_service_spec.rb
-    - ee/spec/services/analytics/cycle_analytics/stages/delete_service_spec.rb
-    - ee/spec/services/analytics/cycle_analytics/stages/list_service_spec.rb
-    - ee/spec/services/analytics/cycle_analytics/stages/update_service_spec.rb
-    - ee/spec/services/analytics/cycle_analytics/value_streams/create_service_spec.rb
-    - ee/spec/services/analytics/deployments/frequency/aggregate_service_spec.rb
-    - ee/spec/services/analytics/devops_adoption/segments/bulk_delete_service_spec.rb
-    - ee/spec/services/analytics/devops_adoption/segments/create_service_spec.rb
-    - ee/spec/services/analytics/devops_adoption/segments/delete_service_spec.rb
-    - ee/spec/services/analytics/devops_adoption/segments/find_or_create_service_spec.rb
     - ee/spec/services/approval_rules/create_service_spec.rb
     - ee/spec/services/audit_event_service_spec.rb
     - ee/spec/services/auto_merge/add_to_merge_train_when_pipeline_succeeds_service_spec.rb
@@ -754,23 +637,13 @@ RSpec/EmptyLineAfterFinalLetItBe:
     - ee/spec/services/ee/notification_service_spec.rb
     - ee/spec/services/ee/resource_events/merge_into_notes_service_spec.rb
     - ee/spec/services/ee/todos/destroy/entity_leave_service_spec.rb
-    - ee/spec/services/epics/create_service_spec.rb
     - ee/spec/services/external_approval_rules/create_service_spec.rb
     - ee/spec/services/external_approval_rules/destroy_service_spec.rb
     - ee/spec/services/external_approval_rules/update_service_spec.rb
-    - ee/spec/services/geo/blob_download_service_spec.rb
-    - ee/spec/services/geo/design_repository_sync_service_spec.rb
-    - ee/spec/services/geo/event_service_spec.rb
-    - ee/spec/services/geo/file_registry_removal_service_spec.rb
-    - ee/spec/services/geo/project_housekeeping_service_spec.rb
     - ee/spec/services/gitlab_subscriptions/activate_service_spec.rb
     - ee/spec/services/gitlab_subscriptions/apply_trial_service_spec.rb
-    - ee/spec/services/groups/autocomplete_service_spec.rb
-    - ee/spec/services/ide/schemas_config_service_spec.rb
     - ee/spec/services/incident_management/incidents/upload_metric_service_spec.rb
     - ee/spec/services/incident_management/oncall_rotations/edit_service_spec.rb
-    - ee/spec/services/issues/build_service_spec.rb
-    - ee/spec/services/issues/export_csv_service_spec.rb
     - ee/spec/services/merge_request_approval_settings/update_service_spec.rb
     - ee/spec/services/merge_trains/check_status_service_spec.rb
     - ee/spec/services/merge_trains/create_pipeline_service_spec.rb
@@ -792,9 +665,6 @@ RSpec/EmptyLineAfterFinalLetItBe:
     - ee/spec/services/requirements_management/update_requirement_service_spec.rb
     - ee/spec/services/resource_access_tokens/create_service_spec.rb
     - ee/spec/services/resource_access_tokens/revoke_service_spec.rb
-    - ee/spec/services/search/global_service_spec.rb
-    - ee/spec/services/search/group_service_spec.rb
-    - ee/spec/services/search/project_service_spec.rb
     - ee/spec/services/security/auto_fix_label_service_spec.rb
     - ee/spec/services/security/store_grouped_scans_service_spec.rb
     - ee/spec/services/security/store_report_service_spec.rb
@@ -819,7 +689,6 @@ RSpec/EmptyLineAfterFinalLetItBe:
     - ee/spec/support/shared_examples/graphql/mutations/set_multiple_assignees_shared_examples.rb
     - ee/spec/support/shared_examples/quick_actions/issue/status_page_quick_actions_shared_examples.rb
     - ee/spec/support/shared_examples/services/search_notes_shared_examples.rb
-    - ee/spec/tasks/gitlab/license_rake_spec.rb
     - ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb
     - ee/spec/views/groups/_compliance_frameworks.html.haml_spec.rb
     - ee/spec/views/groups/edit.html.haml_spec.rb
@@ -841,52 +710,15 @@ RSpec/EmptyLineAfterFinalLetItBe:
     - ee/spec/workers/set_user_status_based_on_user_cap_setting_worker_spec.rb
     - spec/controllers/confirmations_controller_spec.rb
     - spec/controllers/dashboard/projects_controller_spec.rb
-    - spec/controllers/groups/dependency_proxy_auth_controller_spec.rb
-    - spec/controllers/groups/dependency_proxy_for_containers_controller_spec.rb
-    - spec/controllers/groups/registry/repositories_controller_spec.rb
-    - spec/controllers/groups/variables_controller_spec.rb
     - spec/controllers/invites_controller_spec.rb
     - spec/controllers/profiles/emails_controller_spec.rb
-    - spec/controllers/projects/alerting/notifications_controller_spec.rb
-    - spec/controllers/projects/design_management/designs/raw_images_controller_spec.rb
-    - spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb
-    - spec/controllers/projects/environments_controller_spec.rb
-    - spec/controllers/projects/feature_flags_controller_spec.rb
-    - spec/controllers/projects/incidents_controller_spec.rb
-    - spec/controllers/projects/issues_controller_spec.rb
-    - spec/controllers/projects/jobs_controller_spec.rb
-    - spec/controllers/projects/merge_requests_controller_spec.rb
-    - spec/controllers/projects/performance_monitoring/dashboards_controller_spec.rb
-    - spec/controllers/projects/pipelines_controller_spec.rb
-    - spec/controllers/projects/pipelines_settings_controller_spec.rb
-    - spec/controllers/projects/raw_controller_spec.rb
-    - spec/controllers/projects/releases/evidences_controller_spec.rb
-    - spec/controllers/projects/releases_controller_spec.rb
-    - spec/controllers/projects/settings/ci_cd_controller_spec.rb
-    - spec/controllers/projects/settings/operations_controller_spec.rb
-    - spec/controllers/projects/static_site_editor_controller_spec.rb
-    - spec/controllers/projects/todos_controller_spec.rb
-    - spec/controllers/projects_controller_spec.rb
     - spec/controllers/users/terms_controller_spec.rb
-    - spec/features/boards/multiple_boards_spec.rb
-    - spec/features/boards/sidebar_assignee_spec.rb
-    - spec/features/boards/sidebar_due_date_spec.rb
-    - spec/features/boards/sidebar_labels_spec.rb
-    - spec/features/boards/sidebar_milestones_spec.rb
-    - spec/features/boards/sidebar_spec.rb
-    - spec/features/boards/sidebar_subscription_spec.rb
-    - spec/features/boards/sidebar_time_tracking_spec.rb
     - spec/features/cycle_analytics_spec.rb
     - spec/features/dashboard/datetime_on_tooltips_spec.rb
     - spec/features/dashboard/merge_requests_spec.rb
-    - spec/features/error_tracking/user_filters_errors_by_status_spec.rb
-    - spec/features/error_tracking/user_searches_sentry_errors_spec.rb
-    - spec/features/error_tracking/user_sees_error_index_spec.rb
     - spec/features/file_uploads/group_import_spec.rb
     - spec/features/file_uploads/project_import_spec.rb
     - spec/features/file_uploads/user_avatar_spec.rb
-    - spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb
-    - spec/features/groups_spec.rb
     - spec/features/issues/user_sees_breadcrumb_links_spec.rb
     - spec/features/markdown/metrics_spec.rb
     - spec/features/merge_request/user_creates_merge_request_spec.rb
@@ -1093,17 +925,8 @@ RSpec/EmptyLineAfterFinalLetItBe:
     - spec/models/blob_viewer/metrics_dashboard_yml_spec.rb
     - spec/models/chat_name_spec.rb
     - spec/models/chat_team_spec.rb
-    - spec/models/ci/artifact_blob_spec.rb
-    - spec/models/ci/build_spec.rb
-    - spec/models/ci/build_trace_chunk_spec.rb
-    - spec/models/ci/daily_build_group_report_result_spec.rb
-    - spec/models/ci/pipeline_spec.rb
-    - spec/models/ci/runner_spec.rb
-    - spec/models/ci/stage_spec.rb
     - spec/models/clusters/kubernetes_namespace_spec.rb
     - spec/models/commit_spec.rb
-    - spec/models/concerns/batch_destroy_dependent_associations_spec.rb
-    - spec/models/concerns/featurable_spec.rb
     - spec/models/deploy_token_spec.rb
     - spec/models/deployment_spec.rb
     - spec/models/diff_viewer/server_side_spec.rb
@@ -2122,6 +1945,7 @@ Gitlab/NamespacedClass:
     - 'app/finders/deployments_finder.rb'
     - 'app/finders/environment_names_finder.rb'
     - 'app/finders/environments_finder.rb'
+    - 'app/finders/environments_by_deployments_finder.rb'
     - 'app/finders/events_finder.rb'
     - 'app/finders/feature_flags_finder.rb'
     - 'app/finders/feature_flags_user_lists_finder.rb'
@@ -3335,26 +3159,6 @@ Style/HashTransformation:
     - 'ee/lib/gitlab/custom_file_templates.rb'
     - 'ee/spec/elastic_integration/global_search_spec.rb'
     - 'ee/spec/lib/ee/gitlab/application_context_spec.rb'
-    - 'lib/api/helpers/packages/conan/api_helpers.rb'
-    - 'lib/api/projects.rb'
-    - 'lib/atlassian/jira_connect/client.rb'
-    - 'lib/banzai/filter/repository_link_filter.rb'
-    - 'lib/gitlab/ci/config/entry/product/variables.rb'
-    - 'lib/gitlab/ci/config/entry/variables.rb'
-    - 'lib/gitlab/ci/variables/collection.rb'
-    - 'lib/gitlab/ci/variables/helpers.rb'
-    - 'lib/gitlab/git/commit.rb'
-    - 'lib/gitlab/import_sources.rb'
-    - 'lib/gitlab/language_detection.rb'
-    - 'lib/gitlab/metrics/samplers/database_sampler.rb'
-    - 'lib/gitlab/metrics/subscribers/active_record.rb'
-    - 'lib/gitlab/phabricator_import/project_creator.rb'
-    - 'lib/gitlab/prometheus_client.rb'
-    - 'lib/gitlab/repository_hash_cache.rb'
-    - 'lib/gitlab/static_site_editor/config/file_config.rb'
-    - 'lib/gitlab/template/base_template.rb'
-    - 'lib/gitlab/usage_data_counters/base_counter.rb'
-    - 'lib/gitlab/usage_data_counters/note_counter.rb'
     - 'spec/lib/atlassian/jira_connect/serializers/pull_request_entity_spec.rb'
     - 'spec/lib/gitlab/ci/status/composite_spec.rb'
     - 'spec/lib/gitlab/conflict/file_spec.rb'

GITALY_SERVER_VERSION

-22c9b23bfcdeedc373462a54cea5ee55790a62b1
+408a10ac19698a289f4ee1e2a44ddaba31630112

Gemfile

@@ -399,7 +399,7 @@ group :development, :test do
 end
 
 group :development, :test, :danger do
-  gem 'gitlab-dangerfiles', '~> 1.1.0', require: false
+  gem 'gitlab-dangerfiles', '~> 1.1.1', require: false
 end
 
 group :development, :test, :coverage do
@@ -488,7 +488,7 @@ gem 'flipper', '~> 0.17.1'
 gem 'flipper-active_record', '~> 0.17.1'
 gem 'flipper-active_support_cache_store', '~> 0.17.1'
 gem 'unleash', '~> 0.1.5'
-gem 'gitlab-experiment', '~> 0.5.2'
+gem 'gitlab-experiment', '~> 0.5.3'
 
 # Structured logging
 gem 'lograge', '~> 0.5'

Gemfile.lock

@@ -441,9 +441,9 @@ GEM
       terminal-table (~> 1.5, >= 1.5.1)
     gitlab-chronic (0.10.5)
       numerizer (~> 0.2)
-    gitlab-dangerfiles (1.1.0)
+    gitlab-dangerfiles (1.1.1)
       danger-gitlab
-    gitlab-experiment (0.5.2)
+    gitlab-experiment (0.5.3)
       activesupport (>= 3.0)
       scientist (~> 1.6, >= 1.6.0)
     gitlab-fog-azure-rm (1.0.1)
@@ -1423,8 +1423,8 @@ DEPENDENCIES
   gitaly (~> 13.9.0.pre.rc1)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
-  gitlab-dangerfiles (~> 1.1.0)
-  gitlab-experiment (~> 0.5.2)
+  gitlab-dangerfiles (~> 1.1.1)
+  gitlab-experiment (~> 0.5.3)
   gitlab-fog-azure-rm (~> 1.0.1)
   gitlab-fog-google (~> 1.13)
   gitlab-labkit (~> 0.16.2)

app/assets/javascripts/activities.js

@@ -2,14 +2,20 @@
 
 import $ from 'jquery';
 import Cookies from 'js-cookie';
+import createFlash from '~/flash';
+import { s__ } from '~/locale';
 import { localTimeAgo } from './lib/utils/datetime_utility';
 import Pager from './pager';
 
 export default class Activities {
-  constructor(container = '') {
-    this.container = container;
+  constructor(containerSelector = '') {
+    this.containerSelector = containerSelector;
+    this.containerEl = this.containerSelector
+      ? document.querySelector(this.containerSelector)
+      : undefined;
+    this.$contentList = $('.content_list');
 
-    Pager.init(20, true, false, (data) => data, this.updateTooltips, this.container);
+    this.loadActivities();
 
     $('.event-filter-link').on('click', (e) => {
       e.preventDefault();
@@ -18,13 +24,30 @@ export default class Activities {
     });
   }
 
+  loadActivities() {
+    Pager.init({
+      limit: 20,
+      preload: true,
+      prepareData: (data) => data,
+      successCallback: () => this.updateTooltips(),
+      errorCallback: () =>
+        createFlash({
+          message: s__(
+            'Activity|An error occured while retrieving activity. Reload the page to try again.',
+          ),
+          parent: this.containerEl,
+        }),
+      container: this.containerSelector,
+    });
+  }
+
   updateTooltips() {
     localTimeAgo($('.js-timeago', '.content_list'));
   }
 
   reloadActivities() {
-    $('.content_list').html('');
-    Pager.init(20, true, false, (data) => data, this.updateTooltips, this.container);
+    this.$contentList.html('');
+    this.loadActivities();
   }
 
   toggleFilter(sender) {

app/assets/javascripts/blob/file_template_selector.js

@@ -38,6 +38,19 @@ export default class FileTemplateSelector {
     }
 
     this.$wrapper.removeClass('hidden');
+
+    /**
+     * We set the focus on the dropdown that was just shown. This is done so that, after selecting
+     * a template type, the template selector immediately receives the focus.
+     * This improves the UX of the tour as the suggest_gitlab_ci_yml popover requires its target to
+     * be have the focus to appear. This way, users don't have to interact with the template
+     * selector to actually see the first hint: it is shown as soon as the selector becomes visible.
+     * We also need a timeout here, otherwise the template type selector gets stuck and can not be
+     * closed anymore.
+     */
+    setTimeout(() => {
+      this.$dropdown.focus();
+    }, 0);
   }
 
   hide() {

app/assets/javascripts/blob/suggest_gitlab_ci_yml/components/popover.vue

@@ -108,7 +108,6 @@ export default {
     show
     :target="target"
     placement="right"
-    trigger="manual"
     container="viewport"
     :css-classes="['suggest-gitlab-ci-yml', 'ml-4']"
   >

app/assets/javascripts/boards/components/board_content.vue

@@ -18,20 +18,19 @@ export default {
         ? BoardColumn
         : BoardColumnDeprecated,
     BoardContentSidebar: () => import('~/boards/components/board_content_sidebar.vue'),
+    EpicBoardContentSidebar: () =>
+      import('ee_component/boards/components/epic_board_content_sidebar.vue'),
     EpicsSwimlanes: () => import('ee_component/boards/components/epics_swimlanes.vue'),
     GlAlert,
   },
   mixins: [glFeatureFlagMixin()],
+  inject: ['canAdminList'],
   props: {
     lists: {
       type: Array,
       required: false,
       default: () => [],
     },
-    canAdminList: {
-      type: Boolean,
-      required: true,
-    },
     disabled: {
       type: Boolean,
       required: true,
@@ -99,7 +98,7 @@ export default {
 </script>
 
 <template>
-  <div>
+  <div v-cloak data-qa-selector="boards_list">
     <gl-alert v-if="error" variant="danger" :dismissible="true" @dismiss="unsetError">
       {{ error }}
     </gl-alert>
@@ -136,7 +135,14 @@ export default {
 
     <board-content-sidebar
       v-if="isSwimlanesOn || glFeatures.graphqlBoardLists"
-      class="issue-boards-sidebar"
+      class="boards-sidebar"
+      data-testid="issue-boards-sidebar"
+    />
+
+    <epic-board-content-sidebar
+      v-else-if="isEpicBoard"
+      class="boards-sidebar"
+      data-testid="epic-boards-sidebar"
     />
   </div>
 </template>

app/assets/javascripts/boards/components/board_content_sidebar.vue

@@ -34,7 +34,7 @@ export default {
   computed: {
     ...mapGetters([
       'isSidebarOpen',
-      'activeIssue',
+      'activeBoardItem',
       'groupPathForActiveIssue',
       'projectPathForActiveIssue',
     ]),
@@ -46,13 +46,13 @@ export default {
       return this.isIssuableSidebar && this.isSidebarOpen;
     },
     fullPath() {
-      return this.activeIssue?.referencePath?.split('#')[0] || '';
+      return this.activeBoardItem?.referencePath?.split('#')[0] || '';
     },
   },
   methods: {
     ...mapActions(['toggleBoardItem', 'setAssignees']),
     handleClose() {
-      this.toggleBoardItem({ boardItem: this.activeIssue, sidebarType: this.sidebarType });
+      this.toggleBoardItem({ boardItem: this.activeBoardItem, sidebarType: this.sidebarType });
     },
   },
 };
@@ -61,7 +61,6 @@ export default {
 <template>
   <gl-drawer
     v-if="showSidebar"
-    data-testid="sidebar-drawer"
     :open="isSidebarOpen"
     :header-height="$options.headerHeight"
     @close="handleClose"
@@ -70,9 +69,9 @@ export default {
     <template #default>
       <board-sidebar-issue-title />
       <sidebar-assignees-widget
-        :iid="activeIssue.iid"
+        :iid="activeBoardItem.iid"
         :full-path="fullPath"
-        :initial-assignees="activeIssue.assignees"
+        :initial-assignees="activeBoardItem.assignees"
         class="assignee"
         @assignees-updated="setAssignees"
       />
@@ -80,7 +79,7 @@ export default {
       <div>
         <board-sidebar-milestone-select />
         <sidebar-iteration-widget
-          :iid="activeIssue.iid"
+          :iid="activeBoardItem.iid"
           :workspace-path="projectPathForActiveIssue"
           :iterations-workspace-path="groupPathForActiveIssue"
           :issuable-type="issuableType"

app/assets/javascripts/boards/components/board_form.vue

@@ -127,7 +127,7 @@ export default {
       if (this.isDeleteForm) {
         return 'danger';
       }
-      return 'info';
+      return 'confirm';
     },
     title() {
       if (this.readonly) {

app/assets/javascripts/boards/components/board_settings_sidebar.vue

@@ -22,13 +22,7 @@ export default {
       import('ee_component/boards/components/board_settings_list_types.vue'),
   },
   mixins: [glFeatureFlagMixin()],
-  props: {
-    canAdminList: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-  },
+  inject: ['canAdminList'],
   data() {
     return {
       ListType,

app/assets/javascripts/boards/components/sidebar/board_sidebar_due_date.vue

@@ -18,16 +18,16 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['activeIssue', 'projectPathForActiveIssue']),
+    ...mapGetters(['activeBoardItem', 'projectPathForActiveIssue']),
     hasDueDate() {
-      return this.activeIssue.dueDate != null;
+      return this.activeBoardItem.dueDate != null;
     },
     parsedDueDate() {
       if (!this.hasDueDate) {
         return null;
       }
 
-      return parsePikadayDate(this.activeIssue.dueDate);
+      return parsePikadayDate(this.activeBoardItem.dueDate);
     },
     formattedDueDate() {
       if (!this.hasDueDate) {

app/assets/javascripts/boards/components/sidebar/board_sidebar_issue_title.vue

@@ -27,7 +27,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({ issue: 'activeIssue' }),
+    ...mapGetters({ issue: 'activeBoardItem' }),
     pendingChangesStorageKey() {
       return this.getPendingChangesKey(this.issue);
     },

app/assets/javascripts/boards/components/sidebar/board_sidebar_labels_select.vue

@@ -21,9 +21,9 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['activeIssue', 'projectPathForActiveIssue']),
+    ...mapGetters(['activeBoardItem', 'projectPathForActiveIssue']),
     selectedLabels() {
-      const { labels = [] } = this.activeIssue;
+      const { labels = [] } = this.activeBoardItem;
 
       return labels.map((label) => ({
         ...label,
@@ -31,7 +31,7 @@ export default {
       }));
     },
     issueLabels() {
-      const { labels = [] } = this.activeIssue;
+      const { labels = [] } = this.activeBoardItem;
 
       return labels.map((label) => ({
         ...label,
@@ -40,7 +40,7 @@ export default {
     },
   },
   methods: {
-    ...mapActions(['setActiveIssueLabels']),
+    ...mapActions(['setActiveBoardItemLabels']),
     async setLabels(payload) {
       this.loading = true;
       this.$refs.sidebarItem.collapse();
@@ -52,7 +52,7 @@ export default {
           .map((label) => label.id);
 
         const input = { addLabelIds, removeLabelIds, projectPath: this.projectPathForActiveIssue };
-        await this.setActiveIssueLabels(input);
+        await this.setActiveBoardItemLabels(input);
       } catch (e) {
         createFlash({ message: __('An error occurred while updating labels.') });
       } finally {
@@ -65,7 +65,7 @@ export default {
       try {
         const removeLabelIds = [getIdFromGraphQLId(id)];
         const input = { removeLabelIds, projectPath: this.projectPathForActiveIssue };
-        await this.setActiveIssueLabels(input);
+        await this.setActiveBoardItemLabels(input);
       } catch (e) {
         createFlash({ message: __('An error occurred when removing the label.') });
       } finally {