Automatic merge of gitlab-org/omnibus-gitlab master

Author: GitLab Bot

config/software/prometheus.rb

@@ -20,7 +20,7 @@
 require "#{Omnibus::Config.project_root}/lib/gitlab/prometheus_helper"
 
 name 'prometheus'
-version = Gitlab::Version.new('prometheus', '2.47.2')
+version = Gitlab::Version.new('prometheus', '2.48.0')
 default_version version.print
 
 license 'APACHE-2.0'

files/gitlab-config-template/gitlab.rb.template

@@ -1907,6 +1907,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_pages['internal_gitlab_server'] = nil # Defaults to gitlab_server, can be changed to internal load balancer
 # gitlab_pages['auth_secret'] = nil # Generated if not present
 # gitlab_pages['auth_scope'] = nil # Defaults to api, can be changed to read_api to increase security
+# gitlab_pages['auth_timeout'] = "5s" # GitLab application client timeout for authentication
 # gitlab_pages['auth_cookie_session_timeout'] = "10m" # Authentication cookie session timeout (truncated to seconds). A zero value means the cookie will be deleted after the browser session ends
 
 ##! GitLab Pages Server Shutdown Timeout

files/gitlab-cookbooks/gitlab-pages/attributes/default.rb

@@ -33,6 +33,7 @@
 default['gitlab_pages']['auth_redirect_uri'] = nil
 default['gitlab_pages']['auth_secret'] = nil
 default['gitlab_pages']['auth_scope'] = nil
+default['gitlab_pages']['auth_timeout'] = nil
 default['gitlab_pages']['auth_cookie_session_timeout'] = nil
 default['gitlab_pages']['insecure_ciphers'] = false
 default['gitlab_pages']['tls_min_version'] = nil

files/gitlab-cookbooks/gitlab-pages/templates/default/gitlab-pages-config.erb

@@ -17,6 +17,9 @@ auth-secret=<%= @auth_secret %>
 <%- if @auth_scope -%>
 auth-scope=<%= @auth_scope %>
 <%- end -%>
+<%- if @auth_timeout -%>
+auth-timeout=<%= @auth_timeout %>
+<%- end -%>
 <%- if @auth_cookie_session_timeout -%>
 auth-cookie-session-timeout=<%= @auth_cookie_session_timeout %>
 <%- end -%>

spec/chef/cookbooks/gitlab-pages/recipes/gitlab-pages_spec.rb

@@ -214,6 +214,7 @@
             auth_secret: 'auth_secret',
             auth_redirect_uri: 'https://projects.pages.example.com/auth',
             auth_scope: 'read_api',
+            auth_timeout: '10s',
             auth_cookie_session_timeout: '20m',
             access_control: true,
             insecure_ciphers: true,
@@ -271,6 +272,7 @@
             auth-client-secret=app_secret
             auth-secret=auth_secret
             auth-scope=read_api
+            auth-timeout=10s
             auth-cookie-session-timeout=20m
             zip-cache-expiration=120s
             zip-cache-cleanup=1m