Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.markdownlint.yml

@@ -33,7 +33,6 @@ proper-names:
     "API",
     "Asana",
     "Auth0",
-    "Authentiq",
     "Azure",
     "Bamboo",
     "Bitbucket",

.rubocop.yml

@@ -526,12 +526,14 @@ RSpec/FactoryBot/AvoidCreate:
     - 'spec/views/**/*.rb'
     - 'spec/components/**/*.rb'
     - 'spec/mailers/**/*.rb'
+    - 'spec/routes/directs/*.rb'
     - 'ee/spec/presenters/**/*.rb'
     - 'ee/spec/serializers/**/*.rb'
     - 'ee/spec/helpers/**/*.rb'
     - 'ee/spec/views/**/*.rb'
     - 'ee/spec/components/**/*.rb'
     - 'ee/spec/mailers/**/*.rb'
+    - 'ee/spec/routes/directs/*.rb'
 
 RSpec/FactoryBot/StrategyInCallback:
   Enabled: true

.rubocop_todo/rspec/invalid_feature_category.yml

@@ -34,16 +34,7 @@ RSpec/InvalidFeatureCategory:
     - 'spec/features/monitor_sidebar_link_spec.rb'
     - 'spec/features/unsubscribe_links_spec.rb'
     - 'spec/features/whats_new_spec.rb'
-    - 'spec/lib/api/base_spec.rb'
     - 'spec/lib/api/helpers_spec.rb'
-    - 'spec/lib/gitlab/application_context_spec.rb'
-    - 'spec/lib/gitlab/error_tracking/context_payload_generator_spec.rb'
-    - 'spec/lib/gitlab/error_tracking_spec.rb'
-    - 'spec/lib/gitlab/graphql/tracers/logger_tracer_spec.rb'
-    - 'spec/lib/gitlab/graphql/tracers/metrics_tracer_spec.rb'
-    - 'spec/lib/gitlab/metrics/background_transaction_spec.rb'
-    - 'spec/lib/gitlab/sidekiq_middleware/worker_context/client_spec.rb'
-    - 'spec/lib/gitlab/sidekiq_middleware/worker_context/server_spec.rb'
     - 'spec/lib/gitlab/slug/path_spec.rb'
     - 'spec/lib/gitlab/utils/strong_memoize_spec.rb'
     - 'spec/models/application_setting_spec.rb'

Gemfile

@@ -71,7 +71,6 @@ gem 'omniauth-oauth2-generic', '~> 0.2.2'
 gem 'omniauth-saml', '~> 2.0.0'
 gem 'omniauth-twitter', '~> 1.4'
 gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
-gem 'omniauth-authentiq', '~> 0.3.3'
 gem 'omniauth_openid_connect', '~> 0.6.0'
 # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem.
 # See https://docs.gitlab.com/ee/development/emails.html#rationale.

Gemfile.checksum

@@ -391,7 +391,6 @@
 {"name":"omniauth-alicloud","version":"2.0.1","platform":"ruby","checksum":"b14c425bca02b4d0f73e710ceb62c0f1f8533e0c427c1c495d2b40f87b3f48d3"},
 {"name":"omniauth-atlassian-oauth2","version":"0.2.0","platform":"ruby","checksum":"eb07574a188ab8a03376ce288bce86bc2dd4a1382ffa5781cb5e2b7bc15d76c9"},
 {"name":"omniauth-auth0","version":"2.0.0","platform":"ruby","checksum":"823769be7883b45b2fa94367c2f6a17f7b3b1333986016089c016d45827da545"},
-{"name":"omniauth-authentiq","version":"0.3.3","platform":"ruby","checksum":"11b3791085a130782bf14b0088653beeb085638a9548d7110a57d3cbbb54fb4c"},
 {"name":"omniauth-azure-activedirectory-v2","version":"2.0.0","platform":"ruby","checksum":"c484cedd52cd233e3c216c4b3ed667ec07d20e51c550a613b65a0f90fe8ad072"},
 {"name":"omniauth-dingtalk-oauth2","version":"1.0.1","platform":"ruby","checksum":"6545670f1c38344eaf960df9750c550a9534f790f888af088761a9e04269139b"},
 {"name":"omniauth-facebook","version":"4.0.0","platform":"ruby","checksum":"05ae3565c8fdb38df8dab04eb8ca854ea6c18e81591d3e6598ce101293a2f20f"},

Gemfile.lock

@@ -997,9 +997,6 @@ GEM
       omniauth-oauth2 (>= 1.5)
     omniauth-auth0 (2.0.0)
       omniauth-oauth2 (~> 1.4)
-    omniauth-authentiq (0.3.3)
-      jwt (>= 1.5)
-      omniauth-oauth2 (>= 1.5)
     omniauth-azure-activedirectory-v2 (2.0.0)
       omniauth-oauth2 (~> 1.8)
     omniauth-dingtalk-oauth2 (1.0.1)
@@ -1771,7 +1768,6 @@ DEPENDENCIES
   omniauth-alicloud (~> 2.0.1)
   omniauth-atlassian-oauth2 (~> 0.2.0)
   omniauth-auth0 (~> 2.0.0)
-  omniauth-authentiq (~> 0.3.3)
   omniauth-azure-activedirectory-v2 (~> 2.0)
   omniauth-azure-oauth2 (~> 0.0.9)!
   omniauth-cas3 (~> 1.1.4)!

app/assets/images/auth_buttons/authentiq_64.png

@@ -116,7 +116,7 @@ export default {
       return this.targetProjectPath === '';
     },
     ciJobTokenHelpPage() {
-      return helpPagePath('ci/jobs/ci_job_token');
+      return helpPagePath('ci/jobs/ci_job_token#allow-access-to-your-project-with-a-job-token');
     },
   },
   methods: {

app/assets/javascripts/token_access/components/inbound_token_access.vue

@@ -114,7 +114,7 @@ export default {
       return this.targetProjectPath === '';
     },
     ciJobTokenHelpPage() {
-      return helpPagePath('ci/jobs/ci_job_token');
+      return helpPagePath('ci/jobs/ci_job_token#limit-your-projects-job-token-access');
     },
   },
   methods: {

app/assets/javascripts/token_access/components/outbound_token_access.vue

@@ -20,8 +20,8 @@ export default {
 </script>
 <template>
   <div>
-    <outbound-token-access />
-    <inbound-token-access v-if="inboundTokenAccessEnabled" class="gl-pt-5" />
+    <inbound-token-access v-if="inboundTokenAccessEnabled" class="gl-pb-5" />
+    <outbound-token-access class="gl-py-5" />
     <opt-in-jwt />
   </div>
 </template>

app/assets/javascripts/token_access/components/token_access_app.vue

@@ -61,14 +61,6 @@ def cas3
     handle_omniauth
   end
 
-  def authentiq
-    if params['sid']
-      handle_service_ticket oauth['provider'], params['sid']
-    end
-
-    handle_omniauth
-  end
-
   def auth0
     if oauth['uid'].blank?
       fail_auth0_login

app/controllers/omniauth_callbacks_controller.rb

@@ -5,7 +5,6 @@ module AuthHelper
     alicloud
     atlassian_oauth2
     auth0
-    authentiq
     azure_activedirectory_v2
     azure_oauth2
     bitbucket

app/helpers/auth_helper.rb

@@ -27,7 +27,7 @@ module Taskable
   # ignore tasks in code or html comment blocks.  HTML blocks
   # are ok as we allow tasks inside <detail> blocks
   REGEX = %r{
-      #{::Gitlab::Regex.markdown_code_or_html_comment_blocks}
+      #{::Gitlab::Regex.markdown_code_or_html_comments}
     |
       (?<task_item>
         #{ITEM_PATTERN}

app/helpers/timeboxes_routing_helper.rb

@@ -141,12 +141,14 @@ class Namespace < ApplicationRecord
            :npm_package_requests_forwarding,
            to: :package_settings
 
+  before_save :update_new_emails_created_column, if: -> { emails_disabled_changed? }
   before_create :sync_share_with_group_lock_with_parent
   before_update :sync_share_with_group_lock_with_parent, if: :parent_changed?
   after_update :force_share_with_group_lock_on_descendants, if: -> { saved_change_to_share_with_group_lock? && share_with_group_lock? }
   after_update :expire_first_auto_devops_config_cache, if: -> { saved_change_to_auto_devops_enabled? }
   after_update :move_dir, if: :saved_change_to_path_or_parent?, unless: -> { is_a?(Namespaces::ProjectNamespace) }
   after_destroy :rm_dir
+
   after_save :reload_namespace_details
 
   after_commit :refresh_access_of_projects_invited_groups, on: :update, if: -> { previous_changes.key?('share_with_group_lock') }
@@ -599,6 +601,17 @@ def all_ancestors_have_runner_registration_enabled?
 
   private
 
+  def update_new_emails_created_column
+    return if namespace_settings.nil?
+    return if namespace_settings.emails_enabled == !emails_disabled
+
+    if namespace_settings.persisted?
+      namespace_settings.update!(emails_enabled: !emails_disabled)
+    elsif namespace_settings
+      namespace_settings.emails_enabled = !emails_disabled
+    end
+  end
+
   def cluster_enabled_granted?
     (Gitlab.com? || Gitlab.dev_or_test_env?) && root_ancestor.cluster_enabled_grant.present?
   end

app/models/concerns/taskable.rb

@@ -119,6 +119,7 @@ class Project < ApplicationRecord
   before_validation :remove_leading_spaces_on_name
   after_validation :check_pending_delete
   before_save :ensure_runners_token
+  before_save :update_new_emails_created_column, if: -> { emails_disabled_changed? }
 
   after_create -> { create_or_load_association(:project_feature) }
   after_create -> { create_or_load_association(:ci_cd_settings) }
@@ -3388,6 +3389,17 @@ def enabled_package_registry_access_level_by_project_visibility
       ProjectFeature::PRIVATE
     end
   end
+
+  def update_new_emails_created_column
+    return if project_setting.nil?
+    return if project_setting.emails_enabled == !emails_disabled
+
+    if project_setting.persisted?
+      project_setting.update!(emails_enabled: !emails_disabled)
+    elsif project_setting
+      project_setting.emails_enabled = !emails_disabled
+    end
+  end
 end
 
 Project.prepend_mod_with('Project')

app/models/namespace.rb

@@ -1072,16 +1072,6 @@ production: &base
       #             login_url: '/cas/login',
       #             service_validate_url: '/cas/p3/serviceValidate',
       #             logout_url: '/cas/logout' } }
-      # - { name: 'authentiq',
-      #     # for client credentials (client ID and secret), go to https://www.authentiq.com/developers
-      #     app_id: 'YOUR_CLIENT_ID',
-      #     app_secret: 'YOUR_CLIENT_SECRET',
-      #     args: {
-      #             scope: 'aq:name email~rs address aq:push'
-      #             # callback_url parameter is optional except when 'gitlab.host' in this file is set to 'localhost'
-      #             # callback_url: 'YOUR_CALLBACK_URL'
-      #           }
-      #   }
       # - { name: 'github',
       #     app_id: 'YOUR_APP_ID',
       #     app_secret: 'YOUR_APP_SECRET',
@@ -1628,10 +1618,6 @@ test:
             client_id: 'YOUR_AUTH0_CLIENT_ID',
             client_secret: 'YOUR_AUTH0_CLIENT_SECRET',
             namespace: 'YOUR_AUTH0_DOMAIN' } }
-      - { name: 'authentiq',
-          app_id: 'YOUR_CLIENT_ID',
-          app_secret: 'YOUR_CLIENT_SECRET',
-          args: { scope: 'aq:name email~rs address aq:push' } }
       - { name: 'salesforce',
           app_id: 'YOUR_CLIENT_ID',
           app_secret: 'YOUR_CLIENT_SECRET'

app/models/project.rb

@@ -299,7 +299,7 @@
     # TODO: We don't need the `Gitlab::Routing` module at all as we can use
     # the `direct` DSL method of Rails to define url helpers. Move all the
     # custom url helpers to use the `direct` DSL method and remove the `Gitlab::Routing`.
-    # For more information: https://gitlab.com/gitlab-org/gitlab/-/issues/299583
+    # For more information: https://gitlab.com/groups/gitlab-org/-/epics/9866
     Gitlab::Application.routes.set.filter_map { |route| route.name if route.name&.include?('namespace_project') }.each do |name|
       new_name = name.sub('namespace_project', 'project')
 
@@ -315,7 +315,9 @@
     root to: "root#index"
 
     get '*unmatched_route', to: 'application#route_not_found', format: false
-  end
 
-  Gitlab::Routing.add_helpers(TimeboxesRoutingHelper)
+    # Load all custom URLs definitions via `direct' after the last route
+    # definition.
+    draw :directs
+  end
 end

config/feature_flags/development/ci_batch_request_for_local_and_project_includes.yml

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# Custom URL definitions for the Community Edition.
+
+draw 'directs/milestone'

config/gitlab.yml.example

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# @!method milestone_path(milestone, options = {})
+# @!method milestone_url(milestone, options = {})
+direct(:milestone) do |milestone, *args|
+  if milestone.group_milestone?
+    [milestone.group, milestone, *args]
+  elsif milestone.project_milestone?
+    [milestone.project, milestone, *args]
+  end
+end

config/routes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+class AddProjectsEmailsEnabledColumn < Gitlab::Database::Migration[2.0]
+  enable_lock_retries!
+  def change
+    add_column :project_settings, :emails_enabled, :boolean, default: true, null: false
+  end
+end

config/routes/directs.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+class AddNamespacesEmailsEnabledColumn < Gitlab::Database::Migration[2.0]
+  enable_lock_retries!
+
+  def change
+    add_column :namespace_settings, :emails_enabled, :boolean, default: true, null: false
+  end
+end

config/routes/directs/milestone.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+class AddNamespacesEmailsEnabledColumnData < Gitlab::Database::Migration[2.0]
+  disable_ddl_transaction!
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  MIGRATION = 'AddNamespacesEmailsEnabledColumnData'
+  DELAY_INTERVAL = 2.minutes.to_i
+  BATCH_SIZE = 200
+  MAX_BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 20
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :namespaces,
+      :id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      max_batch_size: MAX_BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE,
+      gitlab_schema: :gitlab_main
+    )
+  end
+
+  def down
+    delete_batched_background_migration(MIGRATION, :namespaces, :id, [])
+  end
+end

db/migrate/20221116134507_add_projects_emails_enabled_column.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+class AddProjectsEmailsEnabledColumnData < Gitlab::Database::Migration[2.0]
+  disable_ddl_transaction!
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  MIGRATION = 'AddProjectsEmailsEnabledColumnData'
+  DELAY_INTERVAL = 2.minutes.to_i
+  BATCH_SIZE = 200
+  MAX_BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 20
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :projects,
+      :id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      max_batch_size: MAX_BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE,
+      gitlab_schema: :gitlab_main
+    )
+  end
+
+  def down
+    delete_batched_background_migration(MIGRATION, :projects, :id, [])
+  end
+end

db/migrate/20221116134539_add_namespaces_emails_enabled_column.rb

@@ -0,0 +1 @@
+80504a4700681db9e46d729f4175dc077fae7e1b0235c9178558293b83f7a006

db/post_migrate/20221116134611_add_namespaces_emails_enabled_column_data.rb

@@ -0,0 +1 @@
+dd36d2586454c8799effa598c0a058a6adf332622877eae16dd95d468f9b3958

db/post_migrate/20221116134633_add_projects_emails_enabled_column_data.rb

@@ -0,0 +1 @@
+0668760d6df566ac3081bd9fa2a053497da7a7af652225e91831110435166dcb

db/schema_migrations/20221116134507

@@ -0,0 +1 @@
+ceaf6a2b15da0dde23ba37f1166aa5135a9dce1abbe9fca81a12a41cc0319fd9

db/schema_migrations/20221116134539

@@ -18427,6 +18427,7 @@ CREATE TABLE namespace_settings (
     runner_registration_enabled boolean DEFAULT true,
     allow_runner_registration_token boolean DEFAULT true NOT NULL,
     unique_project_download_limit_alertlist integer[] DEFAULT '{}'::integer[] NOT NULL,
+    emails_enabled boolean DEFAULT true NOT NULL,
     CONSTRAINT check_0ba93c78c7 CHECK ((char_length(default_branch_name) <= 255)),
     CONSTRAINT namespace_settings_unique_project_download_limit_alertlist_size CHECK ((cardinality(unique_project_download_limit_alertlist) <= 100)),
     CONSTRAINT namespace_settings_unique_project_download_limit_allowlist_size CHECK ((cardinality(unique_project_download_limit_allowlist) <= 100))
@@ -20752,6 +20753,7 @@ CREATE TABLE project_settings (
     only_allow_merge_if_all_status_checks_passed boolean DEFAULT false NOT NULL,
     mirror_branch_regex text,
     allow_pipeline_trigger_approve_deployment boolean DEFAULT false NOT NULL,
+    emails_enabled boolean DEFAULT true NOT NULL,
     CONSTRAINT check_2981f15877 CHECK ((char_length(jitsu_key) <= 100)),
     CONSTRAINT check_3a03e7557a CHECK ((char_length(previous_default_branch) <= 4096)),
     CONSTRAINT check_3ca5cbffe6 CHECK ((char_length(issue_branch_template) <= 255)),