From 19e56902cac9a653b0255e88faaced0e0e8ff703 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 31 Aug 2018 10:50:27 -0700
Subject: [PATCH] Bump unauthenticated session time from 1 hour to 2 hours

Users who have their system clocks configured inconsistently due to Daylight
Savings may see a GitLab session cookie that immediately expires, resulting in
a 422 error. To avoid these errors, we can bump the unauthenticated session
time from 1 hour to 2 hours so they have time to login and get the default 7-day
session.

Closes #50393
---
 changelogs/unreleased/sh-bump-unauth-expiration.yml | 5 +++++
 config/initializers/1_settings.rb                   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/sh-bump-unauth-expiration.yml

diff --git a/changelogs/unreleased/sh-bump-unauth-expiration.yml b/changelogs/unreleased/sh-bump-unauth-expiration.yml
new file mode 100644
index 00000000000..107069f3b30
--- /dev/null
+++ b/changelogs/unreleased/sh-bump-unauth-expiration.yml
@@ -0,0 +1,5 @@
+---
+title: Bump unauthenticated session time from 1 hour to 2 hours
+merge_request: 21453
+author:
+type: other
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 9ad55e21d11..ab351b86cae 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -141,7 +141,7 @@ Settings.gitlab['default_projects_features'] ||= {}
 Settings.gitlab['webhook_timeout'] ||= 10
 Settings.gitlab['max_attachment_size'] ||= 10
 Settings.gitlab['session_expire_delay'] ||= 10080
-Settings.gitlab['unauthenticated_session_expire_delay'] ||= 1.hour.to_i
+Settings.gitlab['unauthenticated_session_expire_delay'] ||= 2.hours.to_i
 Settings.gitlab.default_projects_features['issues']             = true if Settings.gitlab.default_projects_features['issues'].nil?
 Settings.gitlab.default_projects_features['merge_requests']     = true if Settings.gitlab.default_projects_features['merge_requests'].nil?
 Settings.gitlab.default_projects_features['wiki']               = true if Settings.gitlab.default_projects_features['wiki'].nil?