diff --git a/app/helpers/common_helper.rb b/app/helpers/common_helper.rb index e610736903..1d8317554c 100644 --- a/app/helpers/common_helper.rb +++ b/app/helpers/common_helper.rb @@ -5,12 +5,6 @@ module CommonHelper end end - def render_google_analytics_code - if Rails.env.production? && SiteSetting.ga_tracking_code.present? - render partial: "common/google_analytics" - end - end - def render_google_tag_manager_code if Rails.env.production? && SiteSetting.gtm_container_id.present? render partial: "common/google_tag_manager" diff --git a/app/views/common/_google_analytics.html.erb b/app/views/common/_google_analytics.html.erb deleted file mode 100644 index c8a7f41740..0000000000 --- a/app/views/common/_google_analytics.html.erb +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index aa81f4b41e..a6e1e70758 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -120,8 +120,6 @@ <%= render :partial => "common/discourse_javascript" %> - <%= render_google_analytics_code %> - <%- unless customization_disabled? %> <%= raw theme_lookup("body_tag") %> <%- end %> diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb index b9c4ab0c46..ab98695c27 100644 --- a/app/views/layouts/crawler.html.erb +++ b/app/views/layouts/crawler.html.erb @@ -32,7 +32,6 @@

<%= t 'powered_by_html' %>

- <%= render_google_analytics_code %> <%= theme_lookup("body_tag") %> <%= yield :after_body %> diff --git a/app/views/users/activate_account.html.erb b/app/views/users/activate_account.html.erb index 44aac1f420..b481df62ae 100644 --- a/app/views/users/activate_account.html.erb +++ b/app/views/users/activate_account.html.erb @@ -40,5 +40,3 @@ }); })(); - -<%= render_google_analytics_code %> diff --git a/app/views/users/password_reset.html.erb b/app/views/users/password_reset.html.erb index db9a3d99e9..3a3c4338bf 100644 --- a/app/views/users/password_reset.html.erb +++ b/app/views/users/password_reset.html.erb @@ -24,5 +24,3 @@ <%- content_for(:head) do %> <%- end %> - -<%= render_google_analytics_code %> diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 75cb0bb7ee..1a51f1cd15 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1058,8 +1058,6 @@ en: must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site. WARNING: enabling this for a live site will revoke access for existing non-staff users!" pending_users_reminder_delay: "Notify moderators if new users have been waiting for approval for longer than this many hours. Set to -1 to disable notifications." maximum_session_age: "User will remain logged in for n hours since last visit" - ga_tracking_code: "OBSOLETE: Google analytics (ga.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" - ga_domain_name: "OBSOLETE: Google analytics (ga.js) domain name, eg: mysite.com; see http://google.com/analytics" ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; see http://google.com/analytics" ga_universal_auto_link_domains: "Enable Google Universal Analytics (analytics.js) cross-domain tracking. Outgoing links to these domains will have the client id added to them. See Google's Cross-Domain Tracking guide." diff --git a/config/site_settings.yml b/config/site_settings.yml index 1878e2ce41..2428262a1b 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -104,12 +104,6 @@ basic: ga_universal_auto_link_domains: default: '' type: list - ga_tracking_code: - client: true - default: '' - ga_domain_name: - client: true - default: '' gtm_container_id: client: true default: '' diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js index 7f48f99947..90150b3920 100644 --- a/test/javascripts/helpers/site-settings.js +++ b/test/javascripts/helpers/site-settings.js @@ -10,8 +10,6 @@ Discourse.SiteSettingsOriginal = { "track_external_right_clicks":false, "ga_universal_tracking_code":"", "ga_universal_domain_name":"auto", - "ga_tracking_code":"UA-33736483-2", - "ga_domain_name":"", "top_menu":"latest|new|unread|categories|top", "post_menu":"like-count|like|share|flag|edit|bookmark|delete|admin|reply", "post_menu_hidden_items":"flag|edit|delete|admin",