Merge pull request #457 from alphagov/bump-admin-gem

Bump admin gem to 2.1.0
alphagov · Mar 26, 2015 · ec43282 · ec43282
2 parents a6d1768 + a8ca81a
commit ec43282
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/Gemfile b/Gemfile
@@ -9,7 +9,7 @@ gem "fetchable", "1.0.0"
 gem "foreman", "0.74.0"
 gem "gds-sso", "9.3.0"
 gem "generic_form_builder", "0.11.0"
-gem "govuk_admin_template", "1.4.0"
+gem "govuk_admin_template", "2.1.0"
 gem "kaminari", "0.16.1"
 gem "logstasher", "0.4.8"
 gem "mongoid", "2.5.2"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -35,14 +35,18 @@ GEM
       multi_json
     arel (3.0.3)
     ast (2.0.0)
+    autoprefixer-rails (5.1.7)
+      execjs
+      json
     awesome_print (1.2.0)
     better_errors (1.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.3.1.0)
-      sass (~> 3.2)
+    bootstrap-sass (3.3.3)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.2.19)
     bson (1.9.2)
     bson_ext (1.9.2)
       bson (~> 1.9.2)
@@ -121,8 +125,8 @@ GEM
       sanitize (~> 2.1.0)
     govuk-content-schema-test-helpers (1.0.2)
       json-schema (~> 2.5.1)
-    govuk_admin_template (1.4.0)
-      bootstrap-sass (~> 3.3.1)
+    govuk_admin_template (2.1.0)
+      bootstrap-sass (~> 3.3.3)
       jquery-rails (~> 3.1.1)
       rails (>= 3.2.0)
     govuk_content_models (22.2.0)
@@ -376,7 +380,7 @@ DEPENDENCIES
   generic_form_builder (= 0.11.0)
   govspeak (= 3.1.0)
   govuk-content-schema-test-helpers (= 1.0.2)
-  govuk_admin_template (= 1.4.0)
+  govuk_admin_template (= 2.1.0)
   govuk_content_models (= 22.2.0)
   govuk_frontend_toolkit (= 0.44.0)
   jasmine-rails

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -2,17 +2,6 @@
   <%= stylesheet_link_tag "application", :media => "all" %>
   <%= javascript_include_tag 'application' %>
   <%= csrf_meta_tags %>
-  <% if Rails.env.production? %>
-    <script>
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-      ga('create', 'UA-26179049-6', 'alphagov.co.uk');
-      ga('send', 'pageview');
-    </script>
-  <% end %>
 <% end %>
 
 <% content_for :page_title, "Specialist Publisher" %>