From 17f664866b9f001168871c13b42ed280e609ead1 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 24 May 2013 23:17:07 +0300 Subject: [PATCH] Fix google analytics setting being ignored --- app/views/layouts/_google_analytics.html.haml | 2 +- app/views/layouts/_head.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_google_analytics.html.haml b/app/views/layouts/_google_analytics.html.haml index 1452651e1c0..81e03c7eff2 100644 --- 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() { diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 637b2987ff8..0775abea3dd 100644 --- 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