Skip to content

Commit

Permalink
Merge pull request #2245 from alphagov/upgrade-to-rails-6
Browse files Browse the repository at this point in the history
Upgrade application to Rails 6.0
  • Loading branch information
pixeltrix authored Aug 24, 2020
2 parents 6796b59 + 2493fba commit 44930a6
Show file tree
Hide file tree
Showing 26 changed files with 530 additions and 314 deletions.
57 changes: 29 additions & 28 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,43 @@ source "https://rubygems.org"

ruby File.read(".ruby-version").chomp

gem "actionpack-page_caching", "1.2.3"
gem "asset_bom_removal-rails", "~> 1.0.0"
gem "govuk_app_config", "~> 2.2.0"
gem "govuk_publishing_components", "~> 21.63.0"
gem "nokogiri", "~> 1.10"
gem "rack_strip_client_ip", "0.0.2"
gem "rails", "~> 5.2"
gem "redis", "~> 4.2.1"
gem "sass-rails", "5.0.7"
gem "uglifier", ">= 1.3.0"
gem "rails", "6.0.3.2"

gem "actionpack-page_caching"
gem "gds-api-adapters"
gem "govuk_app_config"
gem "govuk_frontend_toolkit"
gem "govuk_publishing_components"
gem "govuk_template"
gem "nokogiri"
gem "plek"
gem "rack_strip_client_ip"
gem "redis"
gem "sass-rails"
gem "uglifier"

group :development do
gem "better_errors"
gem "binding_of_caller"
gem "image_optim", "0.26.5"
end

group :test do
gem "govuk-content-schema-test-helpers", "~> 1.6"
gem "govuk_test"
gem "jasmine-core", [">= 2.99", "< 3"]
gem "minitest"
gem "minitest-capybara", "~> 0.9.0"
gem "mocha", "~> 1.11.2", require: false
gem "shoulda"
gem "test-unit"
gem "webmock"
gem "image_optim"
gem "listen"
end

group :development, :test do
gem "jasmine-rails", "~> 0.15.0"
gem "jasmine"
gem "jasmine_selenium_runner", require: false
gem "pry"
gem "rubocop-govuk"
end

gem "gds-api-adapters", "~> 67.0"
gem "govuk_frontend_toolkit", "~> 9.0.0"
gem "govuk_template", "0.26.0"
gem "plek", "4.0.0"
group :test do
gem "govuk-content-schema-test-helpers"
gem "govuk_test"
gem "jasmine-core"
gem "minitest"
gem "minitest-capybara"
gem "mocha", require: false
gem "shoulda-context"
gem "webdrivers"
gem "webmock"
end
Loading

0 comments on commit 44930a6

Please sign in to comment.