Download as
Browse Code »

Commit 15283ee262cce9a184ae945c80c4373b7a6e7deb

Authored by Jacob Vosmaer
2 parents abad0f11 84d249cd
Exists in master and in 8 other branches 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test

Merge branch 'hide_piwik_and_google' into 'master' 

Avoid empty Piwik or Google Analytics settings
Showing 2 changed files with 5 additions and 0 deletions   Show diff stats
CHANGELOG
  Diff comments   View file @15283ee
... ... @@ -23,6 +23,7 @@ omnibus-gitlab repository.
23 23 - Add a 'gitlab-ctl deploy-page' command
24 24 - Automatically create /etc/gitlab/gitlab.rb after the package is installed
25 25 - Security: Use sockets and peer authentication for Postgres
  26 +- Avoid empty Piwik or Google Analytics settings
26 27  
27 28 6.9.4-ee.omnibus.1
28 29 - Security: Use sockets and peer authentication for Postgres
... ...
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @15283ee
... ... @@ -244,12 +244,16 @@ production: &base
244 244 # ==========================
245 245  
246 246 extra:
  247 + <% if @extra_google_analytics_id %>
247 248 ## Google analytics. Uncomment if you want it
248 249 google_analytics_id: <%= single_quote(@extra_google_analytics_id) %>
  250 + <% end %>
249 251  
  252 + <% if @extra_piwik_url %>
250 253 ## Piwik analytics.
251 254 piwik_url: <%= single_quote(@extra_piwik_url) %>
252 255 piwik_site_id: <%= single_quote(@extra_piwik_site_id) %>
  256 + <% end %>
253 257  
254 258 <% if @extra_sign_in_text %>
255 259 ## Text under sign-in page (Markdown enabled)
... ...