Fix google analytics setting being ignored

Dmitriy Zaporozhets
1 parent 63c6f30a
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
app/views/layouts/_google_analytics.html.haml
app/views/layouts/_head.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() {
@@ -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
1	:javascript	1	:javascript
2	var _gaq = _gaq \|\| [];	2	var _gaq = _gaq \|\| [];
3	- _gaq.push(['_setAccount', '#{gitlab_config.google_analytics_id}']);	3	+ _gaq.push(['_setAccount', '#{extra_config.google_analytics_id}']);
4	_gaq.push(['_trackPageview']);	4	_gaq.push(['_trackPageview']);
5		5
6	(function() {	6	(function() {
	@@ -9,7 +9,7 @@		@@ -9,7 +9,7 @@
9	= csrf_meta_tags	9	= csrf_meta_tags
10	= include_gon	10	= include_gon
11		11
12	- = render 'layouts/google_analytics' if gitlab_config.has_key?('google_analytics_id')	12	+ = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id')
13		13
14	-# Atom feed	14	-# Atom feed
15	- if current_user	15	- if current_user