Skip to content
Snippets Groups Projects
Commit 4d16f9903145 authored by Robert Marshall's avatar Robert Marshall
Browse files

Merge branch 'buyer-experience211-gitlab-yml-bizible' into 'master'

Add Bizible settings

See merge request gitlab-org/omnibus-gitlab!5911
No related branches found
No related tags found
2 merge requests!67heptapod#675: making 0.31 the new stable,!66GitLab 14.9
......@@ -661,6 +661,7 @@
# gitlab_rails['extra_google_tag_manager_id'] = '_your_tracking_id'
# gitlab_rails['extra_one_trust_id'] = '_your_one_trust_id'
# gitlab_rails['extra_google_tag_manager_nonce_id'] = '_your_google_tag_manager_id'
# gitlab_rails['extra_bizible'] = false
# 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
......
......@@ -406,6 +406,7 @@
default['gitlab']['gitlab-rails']['extra_google_tag_manager_id'] = nil
default['gitlab']['gitlab-rails']['extra_one_trust_id'] = nil
default['gitlab']['gitlab-rails']['extra_google_tag_manager_nonce_id'] = nil
default['gitlab']['gitlab-rails']['extra_bizible'] = false
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
......
......@@ -1032,6 +1032,11 @@
google_tag_manager_nonce_id: <%= quote(@extra_google_tag_manager_nonce_id) %>
<% end %>
<% if @extra_bizible %>
## Bizible
bizible: <%= @extra_bizible %>
<% end %>
<% if @extra_matomo_url %>
## matomo analytics.
matomo_url: <%= quote(@extra_matomo_url) %>
......
......@@ -66,6 +66,24 @@
expect(gitlab_yml[:production][:extra][:google_tag_manager_nonce_id]).to eq('0000-0000')
end
end
context 'bizible' do
context 'when true' do
before do
stub_gitlab_rb(
gitlab_rails: { bizible: true }
)
end
it 'should set bizible to true' do
expect(chef_run).to create_templatesymlink('Create a gitlab.yml and create a symlink to Rails root').with_variables(
hash_including(
'bizible' => true
)
)
end
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