Commit 51f18dec authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'ag-fix-db-read-only-check' into 'master'

Default maintenance_mode value to false if not explicitly set

See merge request gitlab-org/gitlab!54428
parents 7f4d622f 547ada18
...@@ -157,6 +157,7 @@ module EE ...@@ -157,6 +157,7 @@ module EE
geo_node_allowed_ips: '0.0.0.0/0, ::/0', geo_node_allowed_ips: '0.0.0.0/0, ::/0',
git_two_factor_session_expiry: 15, git_two_factor_session_expiry: 15,
lock_memberships_to_ldap: false, lock_memberships_to_ldap: false,
maintenance_mode: false,
max_personal_access_token_lifetime: nil, max_personal_access_token_lifetime: nil,
mirror_capacity_threshold: Settings.gitlab['mirror_capacity_threshold'], mirror_capacity_threshold: Settings.gitlab['mirror_capacity_threshold'],
mirror_max_capacity: Settings.gitlab['mirror_max_capacity'], mirror_max_capacity: Settings.gitlab['mirror_max_capacity'],
......
---
title: Default maintenance_mode value to false if not explicitly set
merge_request: 54428
author:
type: fixed
...@@ -782,4 +782,10 @@ RSpec.describe ApplicationSetting do ...@@ -782,4 +782,10 @@ RSpec.describe ApplicationSetting do
it { is_expected.to be true } it { is_expected.to be true }
end end
end end
describe 'maintenance mode setting' do
it 'defaults to false' do
expect(subject.maintenance_mode).to be false
end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment