Fix google analytics setting being ignored

2013-05-24 23:17:07 +03:00 · 2013-05-24 23:17:07 +03:00 · 17f664866b
parent 63c6f30aba
commit 17f664866b
2 changed files with 2 additions and 2 deletions
--- a/app/views/layouts/_google_analytics.html.haml
+++ b/app/views/layouts/_google_analytics.html.haml
@ -1,6 +1,6 @@
 :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