Skip to content
Snippets Groups Projects
Commit f34f9370 authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'fix/settings' into 'master'

Fix settings that missing in gitlab.rb but present in gitlab.yml

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6529



Merged-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: default avatarPM Extra <pm@jubeat.net>
parents 8c33a148 268994cd
No related branches found
No related tags found
2 merge requests!102heptapod#1237: making 0.38 the new oldstable,!88Merging upstream 15.7.0+ce.0
......@@ -474,6 +474,9 @@
### Impersonation settings
# gitlab_rails['impersonation_enabled'] = true
### Disable jQuery and CSS animations
# gitlab_rails['disable_animations'] = false
### Application settings cache expiry in seconds. (default: 60)
# gitlab_rails['application_settings_cache_seconds'] = 60
......@@ -672,6 +675,7 @@
# gitlab_rails['extra_matomo_url'] = '_your_matomo_url'
# gitlab_rails['extra_matomo_site_id'] = '_your_matomo_site_id'
# gitlab_rails['extra_matomo_disable_cookies'] = false
# gitlab_rails['extra_maximum_text_highlight_size_kilobytes'] = 512
##! Docs: https://docs.gitlab.com/omnibus/settings/environment-variables.html
# gitlab_rails['env'] = {
......
......@@ -278,6 +278,7 @@
default['gitlab']['gitlab-rails']['registry_issuer'] = "omnibus-gitlab-issuer"
default['gitlab']['gitlab-rails']['registry_notification_secret'] = nil
default['gitlab']['gitlab-rails']['impersonation_enabled'] = nil
default['gitlab']['gitlab-rails']['disable_animations'] = false
default['gitlab']['gitlab-rails']['application_settings_cache_seconds'] = nil
default['gitlab']['gitlab-rails']['sentry_enabled'] = false
default['gitlab']['gitlab-rails']['sentry_dsn'] = nil
......@@ -396,6 +397,7 @@
default['gitlab']['gitlab-rails']['extra_matomo_url'] = nil
default['gitlab']['gitlab-rails']['extra_matomo_site_id'] = nil
default['gitlab']['gitlab-rails']['extra_matomo_disable_cookies'] = nil
default['gitlab']['gitlab-rails']['extra_maximum_text_highlight_size_kilobytes'] = nil
default['gitlab']['gitlab-rails']['rack_attack_git_basic_auth'] = nil
default['gitlab']['gitlab-rails']['db_adapter'] = "postgresql"
......
......@@ -125,6 +125,9 @@
## Impersonation settings
impersonation_enabled: <%= @impersonation_enabled %>
## Disable jQuery and CSS animations
disable_animations: <%= @disable_animations %>
## Application settings cache expiry in seconds. (default: 60)
application_settings_cache_seconds: <%= @application_settings_cache_seconds %>
......@@ -1092,6 +1095,12 @@
matomo_disable_cookies: <%= @extra_matomo_disable_cookies %>
<% end %>
<% if @extra_maximum_text_highlight_size_kilobytes %>
## Maximum file size for syntax highlighting
## https://docs.gitlab.com/ee/user/project/highlighting.html
maximum_text_highlight_size_kilobytes: <%= @extra_maximum_text_highlight_size_kilobytes %>
<% end %>
rack_attack:
git_basic_auth: <%= @rack_attack_git_basic_auth.to_json if @rack_attack_git_basic_auth %>
......
......@@ -67,6 +67,16 @@
end
end
describe 'maximum_text_highlight_size_kilobytes setting' do
before do
stub_gitlab_rb(gitlab_rails: { extra_maximum_text_highlight_size_kilobytes: 128 })
end
it 'renders gitlab.yml with the provided value' do
expect(gitlab_yml[:production][:extra][:maximum_text_highlight_size_kilobytes]).to eq(128)
end
end
context 'bizible' do
context 'when true' do
before do
......
......@@ -225,5 +225,27 @@
end
end
end
describe 'Disable Animations' do
context 'with default configuration' do
it 'render gitlab.yml with default value for disable_animations' do
expect(gitlab_yml[:production][:gitlab][:disable_animations]).to be false
end
end
context 'with user specified configuration' do
before do
stub_gitlab_rb(
gitlab_rails: {
disable_animations: true
}
)
end
it 'render gitlab.yml with user specified value for disable_animations' do
expect(gitlab_yml[:production][:gitlab][:disable_animations]).to be true
end
end
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment