Skip to content
This repository has been archived by the owner on Jun 20, 2022. It is now read-only.

Bump slimmer from 9.0.1 to 10.1.3 #226

Merged
merged 1 commit into from Apr 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

gem 'rails', '4.2.7.1'
gem 'slimmer', '9.0.1'
gem 'slimmer', '~> 10.1.3'

gem 'govuk_frontend_toolkit', '1.2.0'
gem 'sass-rails', '~> 5.0.6'
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Expand Up @@ -214,13 +214,13 @@ GEM
scss_lint (0.52.0)
rake (>= 0.9, < 13)
sass (~> 3.4.20)
slimmer (9.0.1)
slimmer (10.1.3)
activesupport
json
nokogiri (>= 1.5.0, < 1.7.0)
null_logger
plek (>= 1.1.0)
rack (>= 1.3.5)
rack
rest-client
slop (3.6.0)
sprockets (2.11.0)
Expand Down Expand Up @@ -279,7 +279,7 @@ DEPENDENCIES
rails (= 4.2.7.1)
rspec-rails (~> 3.0)
sass-rails (~> 5.0.6)
slimmer (= 9.0.1)
slimmer (~> 10.1.3)
statsd-ruby (= 1.3.0)
uglifier (>= 1.3.0)
unicorn (= 4.8.2)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Expand Up @@ -6,7 +6,7 @@ class ApplicationController < ActionController::Base
# For APIs, you may want to use :null_session instead.
protect_from_forgery with: :exception

include Slimmer::SharedTemplates
include Slimmer::GovukComponents

before_filter :slimmer_headers

Expand Down
2 changes: 0 additions & 2 deletions spec/contracts/govuk_content_schemas_spec.rb
@@ -1,7 +1,5 @@
require 'rails_helper'
require 'gds_api/test_helpers/content_store'
require 'slimmer/test_helpers/shared_templates'
include Slimmer::TestHelpers::SharedTemplates

feature "Viewing manuals and sections examples from govuk-content-schemas" do
include GdsApi::TestHelpers::ContentStore
Expand Down
1 change: 1 addition & 0 deletions spec/rails_helper.rb
Expand Up @@ -2,6 +2,7 @@
ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'
require 'slimmer/rspec'

# Requires supporting ruby files with custom matchers and macros, etc, in
# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
Expand Down
4 changes: 0 additions & 4 deletions spec/support/app_helpers.rb
@@ -1,8 +1,4 @@
require 'slimmer/test_helpers/shared_templates'

module AppHelpers
include Slimmer::TestHelpers::SharedTemplates

def view_manual_change_notes
updates_path = "#{current_path}/updates"
expect_component("metadata", in_scope: 'header') do |metadata|
Expand Down
1 change: 0 additions & 1 deletion spec/support/slimmer.rb

This file was deleted.