Fix google analytics setting being ignored

17f66486 · Dmitriy Zaporozhets · 63c6f30a · 17f66486 · 17f66486
Commit 17f66486 authored May 24, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/views/layouts/_google_analytics.html.haml app/views/layouts/_google_analytics.html.haml +1 -1

app/views/layouts/_head.html.haml app/views/layouts/_head.html.haml +1 -1

No files found.
--- a/app/views/layouts/_google_analytics.html.haml
+++ b/app/views/layouts/_google_analytics.html.haml
 :javascript
  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '#{gitlab_config.google_analytics_id}']);
+  _gaq.push(['_setAccount', '#{extra_config.google_analytics_id}']);
  _gaq.push(['_trackPageview']);

  (function() {

--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -9,7 +9,7 @@
  = csrf_meta_tags
  = include_gon

-  = render 'layouts/google_analytics' if gitlab_config.has_key?('google_analytics_id')
+  = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id')

  -# Atom feed
  - if current_user