Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to Ruby 3 #2978

Merged
merged 15 commits into from
Apr 19, 2022
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.2
3.0.3
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ gem 'pg'
gem 'ruby-units' # for unit conversion
gem 'unicorn' # http server

gem "comfortable_mexican_sofa", "~> 2.0.19"
gem "comfortable_mexican_sofa", git: "https://github.com/restarone/comfortable-mexican-sofa.git"

gem 'active_utils'
gem 'sidekiq'
Expand Down
53 changes: 31 additions & 22 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
GIT
remote: https://github.com/restarone/comfortable-mexican-sofa.git
revision: 2b80ce723ce9b80bb20752c32e81870ad37a25d5
specs:
comfortable_mexican_sofa (2.0.19)
active_link_to (>= 1.0.0)
comfy_bootstrap_form (>= 4.0.0)
haml-rails (>= 1.0.0)
image_processing (>= 1.2)
jquery-rails (>= 4.3.1)
kramdown (>= 1.0.0)
mimemagic (>= 0.3.2)
mini_magick (>= 4.8.0)
rails (>= 5.2.0)
rails-i18n (>= 5.0.0)
sassc-rails (>= 2.0.0)

GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
specs:
rails-assets-leaflet (1.5.1)
rails-assets-leaflet.markercluster (1.4.1)
rails-assets-leaflet (>= 1.3.1)

GEM
remote: https://rubygems.org/
specs:
abstract_type (0.0.7)
actioncable (6.0.4.7)
Expand Down Expand Up @@ -138,17 +161,6 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
comfortable_mexican_sofa (2.0.19)
active_link_to (>= 1.0.0)
comfy_bootstrap_form (>= 4.0.0)
haml-rails (>= 1.0.0)
jquery-rails (>= 4.3.1)
kramdown (>= 1.0.0)
mimemagic (>= 0.3.2)
mini_magick (>= 4.8.0)
rails (>= 5.2.0)
rails-i18n (>= 5.0.0)
sassc-rails (>= 2.0.0)
comfy_bootstrap_form (4.0.9)
rails (>= 5.0.0)
concord (0.1.5)
Expand Down Expand Up @@ -311,7 +323,7 @@ GEM
jsonapi-swagger (0.8.1)
jwt (2.2.2)
kgio (2.11.3)
kramdown (2.3.1)
kramdown (2.3.2)
rexml
launchy (2.5.0)
addressable (~> 2.7)
Expand Down Expand Up @@ -421,9 +433,6 @@ GEM
bundler (>= 1.3.0)
railties (= 6.0.4.7)
sprockets-rails (>= 2.0.0)
rails-assets-leaflet (1.5.1)
rails-assets-leaflet.markercluster (1.4.1)
rails-assets-leaflet (>= 1.3.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand Down Expand Up @@ -522,8 +531,8 @@ GEM
ruby-vips (2.1.4)
ffi (~> 1.12)
ruby2_keywords (0.0.5)
ruby_parser (3.14.2)
sexp_processor (~> 4.9)
ruby_parser (3.18.1)
sexp_processor (~> 4.16)
rubyzip (2.3.2)
sass (3.7.4)
sass-listen (~> 4.0.0)
Expand All @@ -549,7 +558,7 @@ GEM
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sexp_processor (4.15.0)
sexp_processor (4.16.0)
sidekiq (6.4.1)
connection_pool (>= 2.2.2)
rack (~> 2.0)
Expand Down Expand Up @@ -634,7 +643,7 @@ DEPENDENCIES
chartkick
codeclimate-test-reporter
coffee-rails
comfortable_mexican_sofa (~> 2.0.19)
comfortable_mexican_sofa!
csv_shaper
dalli
database_cleaner
Expand Down Expand Up @@ -716,7 +725,7 @@ DEPENDENCIES
xmlrpc

RUBY VERSION
ruby 2.7.2p137
ruby 3.0.3p157
CloCkWeRX marked this conversation as resolved.
Show resolved Hide resolved

BUNDLED WITH
1.17.3
2.3.10
CloCkWeRX marked this conversation as resolved.
Show resolved Hide resolved