Skip to content
This repository has been archived by the owner on Jan 24, 2018. It is now read-only.

Bump slimmer to 8.1.0 #13

Merged
merged 2 commits into from Mar 25, 2015
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
Expand Up @@ -31,7 +31,7 @@ gem 'spring', group: :development
if ENV['SLIMMER_DEV']
gem 'slimmer', :path => '../slimmer'
else
gem 'slimmer', '4.2.0'
gem 'slimmer', '8.1.0'
end

gem 'govuk_frontend_toolkit', '2.0.0'
Expand Down
19 changes: 9 additions & 10 deletions Gemfile.lock
@@ -1,7 +1,6 @@
GEM
remote: https://rubygems.org/
specs:
PriorityQueue (0.1.2)
actionmailer (4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
Expand Down Expand Up @@ -42,18 +41,18 @@ GEM
multi_json (~> 1.2)
json (1.8.1)
kramdown (1.5.0)
lrucache (0.1.4)
PriorityQueue (~> 0.1.2)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
mini_portile (0.6.2)
minitest (5.4.0)
multi_json (1.10.1)
netrc (0.7.7)
nokogiri (1.5.11)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
null_logger (0.0.1)
plek (1.8.1)
plek (1.10.0)
polyglot (0.3.5)
rack (1.5.2)
rack-test (0.6.2)
Expand Down Expand Up @@ -88,12 +87,12 @@ GEM
sdoc (0.4.0)
json (~> 1.8)
rdoc (~> 4.0, < 5.0)
slimmer (4.2.0)
slimmer (8.1.0)
activesupport
json
lrucache (~> 0.1.3)
nokogiri (~> 1.5.0)
nokogiri (>= 1.5.0, < 1.7.0)
null_logger
plek (>= 0.1.8)
plek (>= 1.1.0)
rack (>= 1.3.5)
rest-client
spring (1.1.3)
Expand Down Expand Up @@ -129,6 +128,6 @@ DEPENDENCIES
rest-client
sass-rails (~> 4.0.3)
sdoc (~> 0.4.0)
slimmer (= 4.2.0)
slimmer (= 8.1.0)
spring
uglifier (>= 1.3.0)
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Expand Up @@ -10,6 +10,6 @@ class ApplicationController < ActionController::Base

private
def set_custom_slimmer_headers
set_slimmer_headers(template: 'core_layout')
set_slimmer_headers(template: 'core_layout', report_a_problem: 'false')
end
end