Skip to content

Commit

Permalink
webpacker go 5.3.0 and rails upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric-Guo committed Apr 29, 2021
1 parent 93bb0b0 commit d466e73
Show file tree
Hide file tree
Showing 5 changed files with 1,013 additions and 1,607 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
build:
docker:
# specify the version you desire here
- image: circleci/ruby:2.7.1-node-browsers
- image: circleci/ruby:2.7.3-node-browsers
environment:
PG_HOST: 127.0.0.1
PG_USERNAME: cybros_test
Expand Down
14 changes: 7 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "~> 2.6"
ruby ">= 2.6"

gem "rails", "~> 6.1.0"
gem "rails", "~> 6.1.3"
gem "rails-i18n"

# Use postgresql as the database for Active Record
gem "pg", ">= 0.18", "< 2.0"
gem "pg"

# Use Puma as the app server
gem "puma", "~> 5.0"
gem "puma"
# Use development version of Webpacker
gem "webpacker", "~> 5.0"
gem "webpacker"

# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem "turbolinks", "~> 5"
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem "jbuilder", "~> 2.5"
gem "jbuilder"
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use Active Model has_secure_password
Expand Down Expand Up @@ -61,7 +61,7 @@ end

group :test do
# Adds support for Capybara system testing and selenium driver
gem "capybara", ">= 2.15"
gem "capybara"
gem "selenium-webdriver"
gem "webdrivers"
end
Expand Down
Loading

0 comments on commit d466e73

Please sign in to comment.