Skip to content

Commit

Permalink
Merge pull request #432 from alphagov/bump-slimmer
Browse files Browse the repository at this point in the history
Bump slimmer to pickup Airbrake fixes
  • Loading branch information
NickColley authored Aug 8, 2017
2 parents 4988704 + 2eb255e commit fc2f14c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gem 'dalli'
gem 'gds-api-adapters', '~> 43.0'
gem 'govuk_ab_testing', '~> 2.0'
gem 'govuk_frontend_toolkit', '5.1.0'
gem 'govuk_publishing_components', '~> 0.4.1', require: ENV['RAILS_ENV'] != "production" || ENV['HEROKU_APP_NAME'].to_s.length.positive?
gem 'govuk_publishing_components', '~> 0.4.2', require: ENV['RAILS_ENV'] != "production" || ENV['HEROKU_APP_NAME'].to_s.length.positive?
gem 'htmlentities', '4.3.4'
gem 'logstasher', '0.6.1'
gem 'plek', '1.11'
Expand All @@ -20,7 +20,7 @@ gem 'rails-controller-testing', '~> 0.1'
gem 'rails-i18n', '>= 4.0.4'
gem 'rails_translation_manager', '~> 0.0.2'
gem 'sass-rails', '~> 5.0.4'
gem 'slimmer', '~> 10.1.3'
gem 'slimmer', '~> 10.1.5'
gem 'statsd-ruby', '1.3.0', require: 'statsd'
gem 'uglifier', '>= 1.3.0'
gem 'unicorn', '4.8'
Expand Down
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,12 @@ GEM
sass (>= 3.2.0)
govuk_navigation_helpers (6.3.0)
gds-api-adapters (>= 43.0)
govuk_publishing_components (0.4.1)
govuk_publishing_components (0.4.2)
govspeak (~> 5.0.3)
govuk_frontend_toolkit
rails (~> 5.0.0, >= 5.0.0.1)
sass-rails (~> 5.0.4)
slimmer (~> 10.1.3)
slimmer
govuk_schemas (2.1.0)
json-schema (~> 2.5.0)
highline (1.7.8)
Expand All @@ -127,7 +127,7 @@ GEM
phantomjs (>= 1.9)
railties (>= 3.2.0)
sprockets-rails
json (2.0.3)
json (2.1.0)
json-schema (2.5.2)
addressable (~> 2.3.8)
kgio (2.10.0)
Expand Down Expand Up @@ -249,7 +249,7 @@ GEM
scss_lint (0.54.0)
rake (>= 0.9, < 13)
sass (~> 3.4.20)
slimmer (10.1.3)
slimmer (10.1.5)
activesupport
json
nokogiri (>= 1.5.0, < 1.7.0)
Expand Down Expand Up @@ -315,7 +315,7 @@ DEPENDENCIES
govuk_ab_testing (~> 2.0)
govuk_frontend_toolkit (= 5.1.0)
govuk_navigation_helpers (~> 6.3)
govuk_publishing_components (~> 0.4.1)
govuk_publishing_components (~> 0.4.2)
govuk_schemas
htmlentities (= 4.3.4)
jasmine-rails (~> 0.14.0)
Expand All @@ -330,7 +330,7 @@ DEPENDENCIES
rails-i18n (>= 4.0.4)
rails_translation_manager (~> 0.0.2)
sass-rails (~> 5.0.4)
slimmer (~> 10.1.3)
slimmer (~> 10.1.5)
statsd-ruby (= 1.3.0)
uglifier (>= 1.3.0)
unicorn (= 4.8)
Expand Down

0 comments on commit fc2f14c

Please sign in to comment.