From 8b7cd8b175834a26030e138eb90f6329f2bc3eba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 29 May 2018 15:06:30 +0000 Subject: [PATCH 1/2] Bump govuk_publishing_components from 8.1.0 to 8.2.0 Bumps [govuk_publishing_components](https://github.com/alphagov/govuk_publishing_components) from 8.1.0 to 8.2.0. - [Release notes](https://github.com/alphagov/govuk_publishing_components/releases) - [Changelog](https://github.com/alphagov/govuk_publishing_components/blob/master/CHANGELOG.md) - [Commits](https://github.com/alphagov/govuk_publishing_components/compare/v8.1.0...v8.2.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index e76c38c15..8df23ea14 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'gds-api-adapters', '~> 52.5' gem 'govuk_ab_testing', '~> 2.4' gem 'govuk_app_config', '~> 1.5' gem 'govuk_frontend_toolkit', '~> 7.4' -gem 'govuk_publishing_components', '~> 8.1.0' +gem 'govuk_publishing_components', '~> 8.2.0' gem 'plek', '~> 2.1' gem 'slimmer', '~> 12.1' diff --git a/Gemfile.lock b/Gemfile.lock index 37d7f4c6d..50b3c2fb9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,7 +77,7 @@ GEM nokogiri (~> 1.8) cliver (0.3.2) coderay (1.1.2) - commander (4.4.4) + commander (4.4.5) highline (~> 1.7.2) concurrent-ruby (1.0.5) crack (0.4.3) @@ -91,7 +91,7 @@ GEM execjs (2.7.0) faker (1.8.7) i18n (>= 0.7) - faraday (0.15.1) + faraday (0.15.2) multipart-post (>= 1.2, < 3) ffi (1.9.23) gds-api-adapters (52.5.1) @@ -127,7 +127,7 @@ GEM govuk_frontend_toolkit (7.5.0) railties (>= 3.1.0) sass (>= 3.2.0) - govuk_publishing_components (8.1.0) + govuk_publishing_components (8.2.0) govspeak (>= 5.0.3) govuk_app_config govuk_frontend_toolkit @@ -368,7 +368,7 @@ DEPENDENCIES govuk_ab_testing (~> 2.4) govuk_app_config (~> 1.5) govuk_frontend_toolkit (~> 7.4) - govuk_publishing_components (~> 8.1.0) + govuk_publishing_components (~> 8.2.0) govuk_schemas (~> 3.1) htmlentities (~> 4.3) jasmine-rails From 59802fd3b84cfa91e1404bc54fb768e638612751 Mon Sep 17 00:00:00 2001 From: Tijmen Brommet Date: Tue, 29 May 2018 14:47:58 +0100 Subject: [PATCH 2/2] Remove canonical and other meta tags These are now done by the Machine readable metadata component (https://github.com/alphagov/govuk_publishing_components/pull/335). --- app/views/layouts/application.html.erb | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 362150682..654d0466a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -25,25 +25,6 @@ <% end %> - - - - - - - - - <% if @content_item.respond_to?(:image) && @content_item.image %> - " /> - " /> - - - " /> - " /> - <% else %> - - <% end %> - <%= yield :extra_head_content %>