Skip to content
This repository has been archived by the owner on Oct 4, 2023. It is now read-only.

Commit

Permalink
Update to Rails 6.1
Browse files Browse the repository at this point in the history 
Besides keeping the stack up to date, this is needed for the graphql
extension to work without errors.

See solidusio/solidus_graphql_api#177
  • Loading branch information
@waiting-for-dev
waiting-for-dev committed Aug 30, 2021
1 parent 7c72165 commit 5381264
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 92 deletions.
3 changes: 1 addition & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.6'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.3'
gem 'rails', '~> 6.1'
# Use pg as the database for Active Record
gem 'pg'
# Use Puma as the app server
Expand Down
183 changes: 93 additions & 90 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,75 +42,79 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (6.0.4)
actionpack (= 6.0.4)
actioncable (6.1.4.1)
actionpack (= 6.1.4.1)
activesupport (= 6.1.4.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.4)
actionpack (= 6.0.4)
activejob (= 6.0.4)
activerecord (= 6.0.4)
activestorage (= 6.0.4)
activesupport (= 6.0.4)
actionmailbox (6.1.4.1)
actionpack (= 6.1.4.1)
activejob (= 6.1.4.1)
activerecord (= 6.1.4.1)
activestorage (= 6.1.4.1)
activesupport (= 6.1.4.1)
mail (>= 2.7.1)
actionmailer (6.0.4)
actionpack (= 6.0.4)
actionview (= 6.0.4)
activejob (= 6.0.4)
actionmailer (6.1.4.1)
actionpack (= 6.1.4.1)
actionview (= 6.1.4.1)
activejob (= 6.1.4.1)
activesupport (= 6.1.4.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.4)
actionview (= 6.0.4)
activesupport (= 6.0.4)
rack (~> 2.0, >= 2.0.8)
actionpack (6.1.4.1)
actionview (= 6.1.4.1)
activesupport (= 6.1.4.1)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.4)
actionpack (= 6.0.4)
activerecord (= 6.0.4)
activestorage (= 6.0.4)
activesupport (= 6.0.4)
actiontext (6.1.4.1)
actionpack (= 6.1.4.1)
activerecord (= 6.1.4.1)
activestorage (= 6.1.4.1)
activesupport (= 6.1.4.1)
nokogiri (>= 1.8.5)
actionview (6.0.4)
activesupport (= 6.0.4)
actionview (6.1.4.1)
activesupport (= 6.1.4.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.4)
activesupport (= 6.0.4)
activejob (6.1.4.1)
activesupport (= 6.1.4.1)
globalid (>= 0.3.6)
activemerchant (1.121.0)
activesupport (>= 4.2)
builder (>= 2.1.2, < 4.0.0)
i18n (>= 0.6.9)
nokogiri (~> 1.4)
activemodel (6.0.4)
activesupport (= 6.0.4)
activerecord (6.0.4)
activemodel (= 6.0.4)
activesupport (= 6.0.4)
activestorage (6.0.4)
actionpack (= 6.0.4)
activejob (= 6.0.4)
activerecord (= 6.0.4)
activemodel (6.1.4.1)
activesupport (= 6.1.4.1)
activerecord (6.1.4.1)
activemodel (= 6.1.4.1)
activesupport (= 6.1.4.1)
activestorage (6.1.4.1)
actionpack (= 6.1.4.1)
activejob (= 6.1.4.1)
activerecord (= 6.1.4.1)
activesupport (= 6.1.4.1)
marcel (~> 1.0.0)
activesupport (6.0.4)
mini_mime (>= 1.1.0)
activesupport (6.1.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
acts_as_list (1.0.4)
activerecord (>= 4.2)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
apparition (0.6.0)
capybara (~> 3.13, < 4)
websocket-driver (>= 0.6.5)
autoprefixer-rails (10.0.1.0)
execjs
autoprefixer-rails (10.3.1.0)
execjs (~> 2)
awesome_nested_set (3.4.0)
activerecord (>= 4.0.0, < 7.0)
aws_cf_signer (0.1.3)
Expand Down Expand Up @@ -165,15 +169,15 @@ GEM
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
erubi (1.10.0)
execjs (2.7.0)
execjs (2.8.1)
factory_bot (6.1.0)
activesupport (>= 5.0.0)
faraday (1.1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
ffi (1.15.3)
font-awesome-rails (4.7.0.5)
railties (>= 3.2, < 6.1)
font-awesome-rails (4.7.0.7)
railties (>= 3.2, < 7)
friendly_id (5.4.2)
activerecord (>= 4.0.0)
generator_spec (0.9.4)
Expand All @@ -182,7 +186,7 @@ GEM
globalid (0.5.2)
activesupport (>= 5.0)
graphql (1.11.8)
handlebars_assets (0.23.8)
handlebars_assets (0.23.9)
execjs (~> 2.0)
sprockets (>= 2.0.0)
tilt (>= 1.2)
Expand All @@ -194,7 +198,7 @@ GEM
image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
jbuilder (2.10.1)
jbuilder (2.11.2)
activesupport (>= 5.0.0)
jquery-rails (4.4.0)
rails-dom-testing (>= 1, < 3)
Expand Down Expand Up @@ -230,7 +234,7 @@ GEM
nokogiri (~> 1)
rake
mini_magick (4.11.0)
mini_mime (1.1.0)
mini_mime (1.1.1)
mini_portile2 (2.6.1)
minitest (5.14.4)
monetize (1.11.0)
Expand All @@ -241,7 +245,7 @@ GEM
multipart-post (2.1.1)
netrc (0.11.0)
nio4r (2.5.8)
nokogiri (1.12.3)
nokogiri (1.12.4)
mini_portile2 (~> 2.6.1)
racc (~> 1.4)
paperclip (6.1.0)
Expand Down Expand Up @@ -275,32 +279,32 @@ GEM
rack (>= 2.0.0)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.4)
actioncable (= 6.0.4)
actionmailbox (= 6.0.4)
actionmailer (= 6.0.4)
actionpack (= 6.0.4)
actiontext (= 6.0.4)
actionview (= 6.0.4)
activejob (= 6.0.4)
activemodel (= 6.0.4)
activerecord (= 6.0.4)
activestorage (= 6.0.4)
activesupport (= 6.0.4)
bundler (>= 1.3.0)
railties (= 6.0.4)
rails (6.1.4.1)
actioncable (= 6.1.4.1)
actionmailbox (= 6.1.4.1)
actionmailer (= 6.1.4.1)
actionpack (= 6.1.4.1)
actiontext (= 6.1.4.1)
actionview (= 6.1.4.1)
activejob (= 6.1.4.1)
activemodel (= 6.1.4.1)
activerecord (= 6.1.4.1)
activestorage (= 6.1.4.1)
activesupport (= 6.1.4.1)
bundler (>= 1.15.0)
railties (= 6.1.4.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (6.0.4)
actionpack (= 6.0.4)
activesupport (= 6.0.4)
railties (6.1.4.1)
actionpack (= 6.1.4.1)
activesupport (= 6.1.4.1)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rake (>= 0.13)
thor (~> 1.0)
rainbow (3.0.0)
rake (13.0.6)
ransack (2.4.2)
Expand Down Expand Up @@ -339,7 +343,7 @@ GEM
rspec-support (3.9.4)
rspec_junit_formatter (0.4.1)
rspec-core (>= 2, < 4, != 2.12.0)
ruby-vips (2.1.2)
ruby-vips (2.1.3)
ffi (~> 1.12)
ruby2_keywords (0.0.2)
ruby_dep (1.5.0)
Expand All @@ -364,12 +368,12 @@ GEM
tilt
sentry-raven (3.1.1)
faraday (>= 1.0)
solidus_api (2.11.0)
solidus_api (2.11.10)
jbuilder (~> 2.8)
kaminari-activerecord (~> 1.1)
responders
solidus_core (= 2.11.0)
solidus_backend (2.11.0)
solidus_core (= 2.11.10)
solidus_backend (2.11.10)
autoprefixer-rails
coffee-rails
font-awesome-rails (~> 4.0)
Expand All @@ -379,19 +383,19 @@ GEM
kaminari (~> 1.1)
responders
sassc-rails
solidus_api (= 2.11.0)
solidus_core (= 2.11.0)
solidus_core (2.11.0)
actionmailer (>= 5.2, < 7.0.x)
actionpack (>= 5.2, < 7.0.x)
actionview (>= 5.2, < 7.0.x)
activejob (>= 5.2, < 7.0.x)
solidus_api (= 2.11.10)
solidus_core (= 2.11.10)
solidus_core (2.11.10)
actionmailer (>= 5.2, < 6.2.x)
actionpack (>= 5.2, < 6.2.x)
actionview (>= 5.2, < 6.2.x)
activejob (>= 5.2, < 6.2.x)
activemerchant (~> 1.66)
activemodel (>= 5.2, < 7.0.x)
activerecord (>= 5.2, < 7.0.x)
activesupport (>= 5.2, < 7.0.x)
activemodel (>= 5.2, < 6.2.x)
activerecord (>= 5.2, < 6.2.x)
activesupport (>= 5.2, < 6.2.x)
acts_as_list (< 2.0)
awesome_nested_set (~> 3.2)
awesome_nested_set (~> 3.3)
cancancan (>= 2.2, < 4.0)
carmen (~> 1.1.0)
discard (~> 1.0)
Expand All @@ -402,11 +406,11 @@ GEM
monetize (~> 1.8)
paperclip (>= 4.2)
paranoia (~> 2.4)
railties (>= 5.2, < 7.0.x)
railties (>= 5.2, < 6.2.x)
ransack (~> 2.0)
state_machines-activerecord (~> 0.6)
solidus_sample (2.11.0)
solidus_core (= 2.11.0)
solidus_sample (2.11.10)
solidus_core (= 2.11.10)
solidus_support (0.8.1)
solidus_webhooks (0.4.0)
solidus_core (>= 2.0.0, < 4)
Expand All @@ -432,14 +436,13 @@ GEM
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
thor (1.1.0)
thread_safe (0.3.6)
tilt (2.0.10)
truncate_html (0.9.3)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
Expand Down Expand Up @@ -478,7 +481,7 @@ DEPENDENCIES
puma
rack-attack
rack-cors (~> 1.1)
rails (~> 6.0.3)
rails (~> 6.1)
rb-readline
rspec-rails
rspec_junit_formatter
Expand Down

0 comments on commit 5381264

Please sign in to comment.