Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

1 files changed, 15 insertions, 25 deletions

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index c89db25c347..e46bc5b646c 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -127,8 +127,8 @@ production: &base
     # username_changing_enabled: false # default: true - User can change their username/namespace
     ## Default theme ID
     ##   1 - Indigo
-    ##   2 - Dark
-    ##   3 - Light
+    ##   2 - Gray
+    ##   3 - Light Gray
     ##   4 - Blue
     ##   5 - Green
     ##   6 - Light Indigo
@@ -136,6 +136,7 @@ production: &base
     ##   8 - Light Green
     ##   9 - Red
     ##   10 - Light Red
+    ##   11 - Dark Mode (alpha)
     # default_theme: 1 # default: 1
 
     ## Automatic issue closing
@@ -272,7 +273,7 @@ production: &base
     # secret_file: /home/git/gitlab/.gitlab_mailroom_secret
 
     # File location to read encrypted incoming email secrets from
-    # encrypted_secret_file: /mnt/gitlab/smtp.yaml.enc 
+    # encrypted_secret_file: /mnt/gitlab/smtp.yaml.enc
     # Default: shared/encrypted_settings/incoming_email.yaml.enc
 
   ## Consolidated object store config
@@ -495,7 +496,6 @@ production: &base
   ## To switch to a Jira connect development environment
   jira_connect:
     # atlassian_js_url: 'http://localhost:9292/atlassian.js'
-    # enable_public_keys_storage: true
     # enforce_jira_base_url_https: false
     # additional_iframe_ancestors: ['localhost:*']
 
@@ -1002,7 +1002,7 @@ production: &base
     # auto_sign_in_with_provider: saml
 
     # Sync user's profile from the specified Omniauth providers every time the user logs in (default: empty).
-    # Define the allowed providers using an array, e.g. ["cas3", "saml", "twitter"],
+    # Define the allowed providers using an array, e.g. ["saml", "twitter"],
     # or as true/false to allow all providers or none.
     # When authenticating using LDAP, the user's email is always synced.
     # sync_profile_from_provider: []
@@ -1068,15 +1068,6 @@ production: &base
       # - { name: 'alicloud',
       #     app_id: 'YOUR_APP_ID',
       #     app_secret: 'YOUR_APP_SECRET' }
-      # See omniauth-cas3 for more configuration details
-      # - { name: 'cas3',
-      #     label: 'cas3',
-      #     args: {
-      #             url: 'https://sso.example.com',
-      #             disable_ssl_verification: false,
-      #             login_url: '/cas/login',
-      #             service_validate_url: '/cas/p3/serviceValidate',
-      #             logout_url: '/cas/logout' } }
       # - { name: 'github',
       #     app_id: 'YOUR_APP_ID',
       #     app_secret: 'YOUR_APP_SECRET',
@@ -1140,10 +1131,6 @@ production: &base
       #       client_secret: 'YOUR_AUTH0_CLIENT_SECRET',
       #       namespace: 'YOUR_AUTH0_DOMAIN' } }
 
-    # SSO maximum session duration in seconds. Defaults to CAS default of 8 hours.
-    # cas3:
-    #   session_duration: 28800
-
   # FortiAuthenticator settings
   forti_authenticator:
     # Allow using FortiAuthenticator as OTP provider
@@ -1168,6 +1155,16 @@ production: &base
     # client_id: 'YOUR_FORTI_TOKEN_CLOUD_CLIENT_ID'
     # client_secret: 'YOUR_FORTI_TOKEN_CLOUD_CLIENT_SECRET'
 
+  # Duo Auth settings
+  duo_auth:
+    # Allow using Duo as an OTP provider
+    enabled: false
+
+    # Client ID and Secret to access Duo's API
+    # integration_key: 'YOUR_DUO_INTEGRATION_KEY'
+    # secret_key: 'YOUR_DUO_SECRET_KEY'
+    # hostname: 'YOUR_DUO_API_FQDN'
+
   # Shared file storage settings
   shared:
     # path: /mnt/gitlab # Default: shared
@@ -1574,13 +1571,6 @@ test:
       - { name: 'alicloud',
           app_id: 'YOUR_APP_ID',
           app_secret: 'YOUR_APP_SECRET' }
-      - { name: 'cas3',
-          label: 'cas3',
-          args: { url: 'https://sso.example.com',
-                  disable_ssl_verification: false,
-                  login_url: '/cas/login',
-                  service_validate_url: '/cas/p3/serviceValidate',
-                  logout_url: '/cas/logout' } }
       - { name: 'github',
           app_id: 'YOUR_APP_ID',
           app_secret: 'YOUR_APP_SECRET',