Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/merge_request_templates/Revert To Resolve Incident.md

@@ -12,6 +12,7 @@
 
 - [ ] Create an issue to reinstate the merge request and assign it to the author of the reverted merge request.
 - [ ] If the revert is to resolve a [broken 'master' incident](https://about.gitlab.com/handbook/engineering/workflow/#broken-master), please read through the [Responsibilities of the Broken `master` resolution DRI](https://about.gitlab.com/handbook/engineering/workflow/#responsibilities-of-the-resolution-dri).
+- [ ] If the revert involves a database migration, please read through [Deleting existing migrations](https://docs.gitlab.com/ee/development/database/deleting_migrations.html).
 - [ ] Add the appropriate labels **before** the MR is created. We can skip CI/CD jobs only if the labels are added **before** the CI/CD pipeline is created.
 
 ### Milestone info

GITALY_SERVER_VERSION

@@ -1 +1 @@
-fb7ac6faa5b8e8cad4a66e597665eb12d398b84d
+770edd2d7f8324da646df478eb271544393316df

app/assets/javascripts/projects/compare/components/revision_dropdown.vue

@@ -149,6 +149,7 @@ export default {
         :key="branch"
         is-check-item
         :is-checked="selectedRevision === branch"
+        data-testid="branches-dropdown-item"
         @click="onClick(branch)"
       >
         {{ branch }}
@@ -161,6 +162,7 @@ export default {
         :key="tag"
         is-check-item
         :is-checked="selectedRevision === tag"
+        data-testid="tags-dropdown-item"
         @click="onClick(tag)"
       >
         {{ tag }}

app/controllers/registrations_controller.rb

@@ -133,7 +133,10 @@ def after_inactive_sign_up_path_for(resource)
     # after user confirms and comes back, he will be redirected
     store_location_for(:redirect, after_sign_up_path)
 
-    return identity_verification_redirect_path if custom_confirmation_enabled?
+    if custom_confirmation_enabled?
+      session[:verification_user_id] = resource.id # This is needed to find the user on the identity verification page
+      return identity_verification_redirect_path
+    end
 
     Gitlab::Tracking.event(self.class.name, 'render', user: resource)
     users_almost_there_path(email: resource.email)
@@ -220,7 +223,7 @@ def resource_name
 
   def resource
     @resource ||= Users::RegistrationsBuildService
-                    .new(current_user, sign_up_params.merge({ skip_confirmation: registered_with_invite_email?,
+                    .new(current_user, sign_up_params.merge({ skip_confirmation: skip_confirmation?,
                                                               preferred_language: preferred_language }))
                     .execute
   end
@@ -229,6 +232,10 @@ def devise_mapping
     @devise_mapping ||= Devise.mappings[:user]
   end
 
+  def skip_confirmation?
+    registered_with_invite_email?
+  end
+
   def registered_with_invite_email?
     invite_email = session.delete(:invite_email)
 

app/helpers/registrations_helper.rb

@@ -14,6 +14,10 @@ def signup_username_data_attributes
   def arkose_labs_challenge_enabled?
     false
   end
+
+  def signup_box_template
+    'devise/shared/signup_box'
+  end
 end
 
 RegistrationsHelper.prepend_mod_with('RegistrationsHelper')

app/mailers/emails/work_items.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Emails
+  module WorkItems
+    def import_work_items_csv_email(user_id, project_id, results)
+      @user = User.find(user_id)
+      @project = Project.find(project_id)
+      @results = results
+
+      email_with_layout(
+        to: @user.notification_email_for(@project),
+        subject: subject('Imported work items'))
+    end
+  end
+end

app/mailers/notify.rb

@@ -25,6 +25,7 @@ class Notify < ApplicationMailer
   include Emails::AdminNotification
   include Emails::IdentityVerification
   include Emails::Imports
+  include Emails::WorkItems
 
   helper TimeboxesHelper
   helper MergeRequestsHelper

app/mailers/previews/notify_preview.rb

@@ -84,6 +84,10 @@ def import_issues_csv_email
     Notify.import_issues_csv_email(user.id, project.id, { success: 3, errors: [5, 6, 7], valid_file: true })
   end
 
+  def import_work_items_csv_email
+    Notify.import_work_items_csv_email(user.id, project.id, { success: 4, error_lines: [2, 3, 4], parse_error: false })
+  end
+
   def issues_csv_email
     Notify.issues_csv_email(user, project, '1997,Ford,E350', { truncated: false, rows_expected: 3, rows_written: 3 }).message
   end

app/services/work_items/import_csv_service.rb

@@ -6,14 +6,18 @@ class ImportCsvService < ImportCsv::BaseService
 
     NotAvailableError = StandardError.new('This feature is currently behind a feature flag and it is not available.')
 
+    def self.required_headers
+      %w[title].freeze
+    end
+
     def execute
       raise NotAvailableError if ::Feature.disabled?(:import_export_work_items_csv, project)
 
       super
     end
 
     def email_results_to_user
-      # todo as part of https://gitlab.com/gitlab-org/gitlab/-/issues/379153
+      Notify.import_work_items_csv_email(user.id, project.id, results).deliver_later
     end
 
     private
@@ -36,15 +40,13 @@ def attributes_for(row)
 
     override :validate_headers_presence!
     def validate_headers_presence!(headers)
-      headers.downcase! if headers
+      required_headers = self.class.required_headers
+
+      headers.downcase!
       return if headers && required_headers.all? { |rh| headers.include?(rh) }
 
       required_headers_message = "Required headers are missing. Required headers are #{required_headers.join(', ')}"
       raise CSV::MalformedCSVError.new(required_headers_message, 1)
     end
-
-    def required_headers
-      %w[title].freeze
-    end
   end
 end

app/views/devise/registrations/new.html.haml

@@ -8,7 +8,7 @@
 = render "layouts/google_tag_manager_body"
 
 .signup-page
-  = render 'devise/shared/signup_box',
+  = render signup_box_template,
     url: registration_path(resource_name, glm_tracking_params.to_hash),
     button_text: _('Register'),
     borderless: Feature.enabled?(:restyle_login_page, @project),

app/views/notify/import_work_items_csv_email.html.haml

@@ -0,0 +1,18 @@
+- text_style = 'font-size:16px; text-align:center;  line-height:30px;'
+
+%p{ style: text_style }
+  - project_link = link_to(@project.full_name, project_url(@project), style: "color:#3777b0; text-decoration:none;")
+  = s_('Notify|Your CSV import of work items for project %{project_link} has been completed.').html_safe % { project_link: project_link }
+
+%p{ style: text_style }
+  - work_items = n_('%d work item', '%d work items', @results[:success]) % @results[:success]
+  = s_('Notify|%{work_items} imported.') % { work_items: work_items }
+
+- if @results[:error_lines].present?
+  %p{ style: text_style }
+    = s_('Notify|Errors found on %{singular_or_plural_line}: %{error_lines}. Please check that these lines have the following fields: %{required_headers}.') % { singular_or_plural_line: n_('line', 'lines', @results[:error_lines].size), required_headers: WorkItems::ImportCsvService.required_headers.join(', '),
+      error_lines: @results[:error_lines].join(', ') }
+
+- if @results[:parse_error]
+  %p{ style: text_style }
+    = s_('Notify|Error parsing CSV file. Please make sure it has the correct format: a delimited text file that uses a comma to separate values.')

app/views/notify/import_work_items_csv_email.text.erb

@@ -0,0 +1,11 @@
+Your CSV import for project <%= @project.full_name %> (<%= project_url(@project) %>) has been completed.
+
+<%= pluralize(@results[:success], 'work item') %> imported.
+
+<% if @results[:error_lines].present? %>
+Errors found on line <%= 'number'.pluralize(@results[:error_lines].size) %>: <%= @results[:error_lines].join(', ') %>. Please check that these lines have the following fields: <%= WorkItems::ImportCsvService.required_headers.join(', ') %>.
+<% end %>
+
+<% if @results[:parse_error] %>
+Error parsing CSV file. Please make sure it has the correct format: a delimited text file that uses a comma to separate values.
+<% end %>

db/docs/postgres_async_foreign_key_validations.yml

@@ -1,7 +1,7 @@
 ---
 table_name: postgres_async_foreign_key_validations
 classes:
-- Gitlab::Database::AsyncForeignKeys::PostgresAsyncForeignKeyValidation
+- Gitlab::Database::AsyncConstraints::PostgresAsyncConstraintValidation
 feature_categories:
 - database
 description: >-

doc/administration/monitoring/prometheus/gitlab_metrics.md

@@ -218,7 +218,7 @@ configuration option in `gitlab.yml`. These metrics are served from the
 | `geo_lfs_objects_registry`                     | Gauge   | 14.6  | Number of LFS objects in the registry | `url` |
 | `geo_lfs_objects_verified`                     | Gauge   | 14.6  | Number of LFS objects verified on secondary | `url` |
 | `geo_lfs_objects_verification_failed`          | Gauge   | 14.6 | Number of LFS objects' verifications failed on secondary | `url` |
-| `geo_lfs_objects_verification_total`           | Gauge   | 14.6  | Number of LFS objects' verifications tried on secondary | `url` |LFS objects failed to sync on secondary | `url` |
+| `geo_lfs_objects_verification_total`           | Gauge   | 14.6  | Number of LFS objects' verifications tried on secondary | `url` |
 | `geo_attachments`                              | Gauge   | 10.2  | Total number of file attachments available on primary | `url` |
 | `geo_attachments_synced`                       | Gauge   | 10.2  | Number of attachments synced on secondary | `url` |
 | `geo_attachments_failed`                       | Gauge   | 10.2  | Number of attachments failed to sync on secondary | `url` |

doc/development/database/add_foreign_key_to_existing_column.md

@@ -252,7 +252,7 @@ validating a foreign key:
 1. Enable the feature flag by running `Feature.enable(:database_async_foreign_key_validation)`
    in the Rails console.
 1. Run `bundle exec rails db:migrate` so that it creates an entry in the async validation table.
-1. Run `bundle exec rails gitlab:db:execute_async_fk_validations:all` so that the FK is validated
+1. Run `bundle exec rails gitlab:db:validate_async_constraints:all` so that the FK is validated
    asynchronously on all databases.
 1. To verify the foreign key, open the PostgreSQL console using the
    [GDK](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/howto/postgresql.md)

doc/user/clusters/agent/gitops.md

@@ -12,6 +12,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > - [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/346585) to make the `id` attribute optional in GitLab 15.7.
 > - Specifying a branch, tag, or commit reference to fetch the Kubernetes manifest files [introduced](https://gitlab.com/groups/gitlab-org/-/epics/4516) in GitLab 15.7.
 
+NOTE:
+From GitLab 15.10, you should use [Flux](gitops/flux.md) for GitOps. For more information, see
+[this announcement blog post](https://about.gitlab.com/blog/2023/02/08/why-did-we-choose-to-integrate-fluxcd-with-gitlab/).
+
 With GitOps, you can manage containerized clusters and applications from a Git repository that:
 
 - Is the single source of truth of your system.

doc/user/clusters/agent/index.md

@@ -12,6 +12,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/3834) in GitLab 13.11, the GitLab agent became available on GitLab.com.
 > - [Moved](https://gitlab.com/groups/gitlab-org/-/epics/6290) from GitLab Premium to GitLab Free in 14.5.
 > - [Renamed](https://gitlab.com/groups/gitlab-org/-/epics/7167) from "GitLab Kubernetes Agent" to "GitLab agent for Kubernetes" in GitLab 14.6.
+> - Flux [recommended](https://gitlab.com/gitlab-org/gitlab/-/issues/357947#note_1253489000) as GitOps solution in GitLab 15.10.
 
 You can connect your Kubernetes cluster with GitLab to deploy, manage,
 and monitor your cloud-native solutions.
@@ -33,20 +34,7 @@ You can choose from two primary workflows. The GitOps workflow is recommended.
 
 ### GitOps workflow
 
-In a [**GitOps** workflow](gitops.md):
-
-- You keep your Kubernetes manifests in GitLab.
-- You install a GitLab agent in your cluster.
-- Any time you update your manifests, the agent updates the cluster.
-- The cluster automatically cleans up unexpected changes. It uses
-  [server-side applies](https://kubernetes.io/docs/reference/using-api/server-side-apply/)
-  to fix any configuration inconsistencies that third parties introduce.
-
-This workflow is fully driven with Git and is considered **pull-based**,
-because the cluster is pulling updates from your GitLab repository.
-
-GitLab recommends this workflow. We are actively investing in this workflow
-so we can provide a first-class experience.
+You should use Flux for GitOps. To get started, see the GitLab [Flux documentation](../../../user/clusters/agent/gitops/flux.md).
 
 ### GitLab CI/CD workflow
 

lib/gitlab/database/async_foreign_keys.rb lib/gitlab/database/async_constraints.rb

@@ -2,11 +2,11 @@
 
 module Gitlab
   module Database
-    module AsyncForeignKeys
+    module AsyncConstraints
       DEFAULT_ENTRIES_PER_INVOCATION = 2
 
       def self.validate_pending_entries!(how_many: DEFAULT_ENTRIES_PER_INVOCATION)
-        PostgresAsyncForeignKeyValidation.ordered.limit(how_many).each do |record|
+        PostgresAsyncConstraintValidation.ordered.limit(how_many).each do |record|
           ForeignKeyValidator.new(record).perform
         end
       end

lib/gitlab/database/async_foreign_keys/foreign_key_validator.rb lib/gitlab/database/async_constraints/foreign_key_validator.rb

@@ -2,7 +2,7 @@
 
 module Gitlab
   module Database
-    module AsyncForeignKeys
+    module AsyncConstraints
       class ForeignKeyValidator
         include AsyncDdlExclusiveLeaseGuard
 

lib/gitlab/database/async_foreign_keys/migration_helpers.rb lib/gitlab/database/async_constraints/migration_helpers.rb

@@ -2,25 +2,25 @@
 
 module Gitlab
   module Database
-    module AsyncForeignKeys
+    module AsyncConstraints
       module MigrationHelpers
         # Prepares a foreign key for asynchronous validation.
         #
-        # Stores the FK information in the postgres_async_foreign_key_validations
+        # Stores the FK information in the postgres_async_constraint_validations
         # table to be executed later.
         #
         def prepare_async_foreign_key_validation(table_name, column_name = nil, name: nil)
           Gitlab::Database::QueryAnalyzers::RestrictAllowedSchemas.require_ddl_mode!
 
-          return unless async_fk_validation_available?
+          return unless async_constraint_validation_available?
 
           fk_name = name || concurrent_foreign_key_name(table_name, column_name)
 
           unless foreign_key_exists?(table_name, name: fk_name)
             raise missing_schema_object_message(table_name, "foreign key", fk_name)
           end
 
-          async_validation = PostgresAsyncForeignKeyValidation
+          async_validation = PostgresAsyncConstraintValidation
             .find_or_create_by!(name: fk_name, table_name: table_name)
 
           Gitlab::AppLogger.info(
@@ -34,19 +34,19 @@ def prepare_async_foreign_key_validation(table_name, column_name = nil, name: ni
         def unprepare_async_foreign_key_validation(table_name, column_name = nil, name: nil)
           Gitlab::Database::QueryAnalyzers::RestrictAllowedSchemas.require_ddl_mode!
 
-          return unless async_fk_validation_available?
+          return unless async_constraint_validation_available?
 
           fk_name = name || concurrent_foreign_key_name(table_name, column_name)
 
-          PostgresAsyncForeignKeyValidation
+          PostgresAsyncConstraintValidation
             .find_by(name: fk_name, table_name: table_name)
             .try(&:destroy!)
         end
 
         def prepare_partitioned_async_foreign_key_validation(table_name, column_name = nil, name: nil)
           Gitlab::Database::QueryAnalyzers::RestrictAllowedSchemas.require_ddl_mode!
 
-          return unless async_fk_validation_available?
+          return unless async_constraint_validation_available?
 
           Gitlab::Database::PostgresPartitionedTable.each_partition(table_name) do |partition|
             prepare_async_foreign_key_validation(partition.identifier, column_name, name: name)
@@ -56,7 +56,7 @@ def prepare_partitioned_async_foreign_key_validation(table_name, column_name = n
         def unprepare_partitioned_async_foreign_key_validation(table_name, column_name = nil, name: nil)
           Gitlab::Database::QueryAnalyzers::RestrictAllowedSchemas.require_ddl_mode!
 
-          return unless async_fk_validation_available?
+          return unless async_constraint_validation_available?
 
           Gitlab::Database::PostgresPartitionedTable.each_partition(table_name) do |partition|
             unprepare_async_foreign_key_validation(partition.identifier, column_name, name: name)
@@ -65,8 +65,8 @@ def unprepare_partitioned_async_foreign_key_validation(table_name, column_name =
 
         private
 
-        def async_fk_validation_available?
-          connection.table_exists?(:postgres_async_foreign_key_validations)
+        def async_constraint_validation_available?
+          PostgresAsyncConstraintValidation.table_available?
         end
       end
     end

lib/gitlab/database/async_foreign_keys/postgres_async_foreign_key_validation.rb lib/gitlab/database/async_constraints/postgres_async_constraint_validation.rb

@@ -2,8 +2,8 @@
 
 module Gitlab
   module Database
-    module AsyncForeignKeys
-      class PostgresAsyncForeignKeyValidation < SharedModel
+    module AsyncConstraints
+      class PostgresAsyncConstraintValidation < SharedModel
         include QueueErrorHandlingConcern
 
         self.table_name = 'postgres_async_foreign_key_validations'
@@ -15,6 +15,10 @@ class PostgresAsyncForeignKeyValidation < SharedModel
         validates :table_name, presence: true, length: { maximum: MAX_IDENTIFIER_LENGTH }
 
         scope :ordered, -> { order(attempts: :asc, id: :asc) }
+
+        def self.table_available?
+          connection.table_exists?(table_name)
+        end
       end
     end
   end

lib/gitlab/database/migration_helpers.rb

@@ -14,7 +14,7 @@ module MigrationHelpers
       include DynamicModelHelpers
       include RenameTableHelpers
       include AsyncIndexes::MigrationHelpers
-      include AsyncForeignKeys::MigrationHelpers
+      include AsyncConstraints::MigrationHelpers
 
       def define_batchable_model(table_name, connection: self.connection)
         super(table_name, connection: connection)

lib/gitlab/database/reindexing.rb

@@ -28,7 +28,7 @@ def self.invoke(database = nil)
           # Hack: Before we do actual reindexing work, create async indexes
           Gitlab::Database::AsyncIndexes.create_pending_indexes! if Feature.enabled?(:database_async_index_creation, type: :ops)
           Gitlab::Database::AsyncIndexes.drop_pending_indexes!
-          Gitlab::Database::AsyncForeignKeys.validate_pending_entries! if Feature.enabled?(:database_async_foreign_key_validation, type: :ops)
+          Gitlab::Database::AsyncConstraints.validate_pending_entries! if Feature.enabled?(:database_async_foreign_key_validation, type: :ops)
 
           automatic_reindexing
         end