Skip to content

Commit

Permalink
Merge branch 'master' into tarebyte/create-devcontainer
Browse files Browse the repository at this point in the history
  • Loading branch information
tarebyte committed Jul 19, 2023
2 parents d587128 + 4f6e282 commit aeafd94
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.8
2.7.8
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.8'
ruby '2.7.8'

gem 'rails', '~> 5.2.4.2'
gem 'pg', '>= 0.18', '< 2.0'
Expand Down
23 changes: 12 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ GEM
bindex (0.5.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
msgpack (~> 1.0)
bootsnap (1.16.0)
msgpack (~> 1.2)
bootstrap_form (4.2.0)
actionpack (>= 5.0)
activemodel (>= 5.0)
Expand Down Expand Up @@ -111,7 +111,7 @@ GEM
factory_bot_rails (5.1.0)
factory_bot (~> 5.1.0)
railties (>= 4.2.0)
ffi (1.9.25)
ffi (1.15.5)
gemoji (3.0.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
Expand Down Expand Up @@ -153,14 +153,15 @@ GEM
nokogiri (~> 1)
rake
mini_mime (1.0.2)
mini_portile2 (2.4.0)
mini_portile2 (2.8.2)
minitest (5.14.0)
msgpack (1.2.4)
msgpack (1.7.1)
multi_json (1.13.1)
netrc (0.11.0)
nio4r (2.5.2)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
nokogiri (1.15.3)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
parallel (1.23.0)
parser (3.2.2.3)
ast (~> 2.4.1)
Expand Down Expand Up @@ -213,9 +214,9 @@ GEM
thor (>= 0.19.0, < 2.0)
rainbow (3.1.1)
rake (13.0.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
redis (4.1.0)
regexp_parser (2.8.1)
rest-client (2.0.2)
Expand Down Expand Up @@ -375,7 +376,7 @@ DEPENDENCIES
webpacker (~> 5.0.1)

RUBY VERSION
ruby 2.5.8p224
ruby 2.7.8p225

BUNDLED WITH
1.17.3

0 comments on commit aeafd94

Please sign in to comment.