Skip to content

Commit

Permalink
Merge pull request doubtfire-lms#357 from macite/config/rails-7
Browse files Browse the repository at this point in the history 
feat: update to rails 7
  • Loading branch information
@macite
macite authored Jan 13, 2022
2 parents efce345 + 0e2cb6b commit 12b17dd
Show file tree
Hide file tree
Showing 131 changed files with 4,477 additions and 5,216 deletions.
11 changes: 4 additions & 7 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ ruby_versions = {
ruby ruby_versions[(ENV['RAILS_ENV'] || 'development').to_sym]

# The venerable, almighty Rails
gem 'rails', '~>6.1.0'
gem 'rails', '~>7.0.0'

group :development, :test do
gem "sprockets-rails"
gem 'better_errors'
gem 'byebug'
gem 'database_cleaner'
Expand All @@ -30,9 +31,8 @@ group :development, :test, :staging do
gem 'factory_bot'
gem 'factory_bot_rails'
gem 'faker'
gem 'minitest', '~>5.14'
gem 'minitest'
gem 'minitest-around'
gem 'minitest-rails'
gem 'webmock'
end

Expand All @@ -48,7 +48,7 @@ gem 'bootsnap', '>= 1.4.4', require: false
gem 'hirb'

# Authentication
gem 'devise', '~> 4.7.1'
gem 'devise'
gem 'devise_ldap_authenticatable'
gem 'json-jwt', '1.7.0'
gem 'ruby-saml', '~> 1.13.0'
Expand All @@ -66,15 +66,12 @@ gem 'moss_ruby', '>= 1.1.2'
gem 'rails-latex', '>2.3'

# API
gem 'active_model_serializers', '~> 0.10.0'
gem 'grape'
gem 'grape-active_model_serializers', '~> 1.3.2'
gem 'grape-entity'
gem 'grape-swagger'
gem 'grape-swagger-rails'

# Miscellaneous
gem 'attr_encrypted', '~> 3.1.0'
gem 'ci_reporter'
gem 'dotenv-rails'
gem 'rack-cors', require: 'rack/cors'
Expand Down
165 changes: 80 additions & 85 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,76 +1,75 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.4.4)
actionpack (= 6.1.4.4)
activesupport (= 6.1.4.4)
actioncable (7.0.1)
actionpack (= 7.0.1)
activesupport (= 7.0.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.4.4)
actionpack (= 6.1.4.4)
activejob (= 6.1.4.4)
activerecord (= 6.1.4.4)
activestorage (= 6.1.4.4)
activesupport (= 6.1.4.4)
actionmailbox (7.0.1)
actionpack (= 7.0.1)
activejob (= 7.0.1)
activerecord (= 7.0.1)
activestorage (= 7.0.1)
activesupport (= 7.0.1)
mail (>= 2.7.1)
actionmailer (6.1.4.4)
actionpack (= 6.1.4.4)
actionview (= 6.1.4.4)
activejob (= 6.1.4.4)
activesupport (= 6.1.4.4)
net-imap
net-pop
net-smtp
actionmailer (7.0.1)
actionpack (= 7.0.1)
actionview (= 7.0.1)
activejob (= 7.0.1)
activesupport (= 7.0.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (6.1.4.4)
actionview (= 6.1.4.4)
activesupport (= 6.1.4.4)
rack (~> 2.0, >= 2.0.9)
actionpack (7.0.1)
actionview (= 7.0.1)
activesupport (= 7.0.1)
rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.4.4)
actionpack (= 6.1.4.4)
activerecord (= 6.1.4.4)
activestorage (= 6.1.4.4)
activesupport (= 6.1.4.4)
actiontext (7.0.1)
actionpack (= 7.0.1)
activerecord (= 7.0.1)
activestorage (= 7.0.1)
activesupport (= 7.0.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (6.1.4.4)
activesupport (= 6.1.4.4)
actionview (7.0.1)
activesupport (= 7.0.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_model_serializers (0.10.12)
actionpack (>= 4.1, < 6.2)
activemodel (>= 4.1, < 6.2)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (6.1.4.4)
activesupport (= 6.1.4.4)
activejob (7.0.1)
activesupport (= 7.0.1)
globalid (>= 0.3.6)
activemodel (6.1.4.4)
activesupport (= 6.1.4.4)
activerecord (6.1.4.4)
activemodel (= 6.1.4.4)
activesupport (= 6.1.4.4)
activestorage (6.1.4.4)
actionpack (= 6.1.4.4)
activejob (= 6.1.4.4)
activerecord (= 6.1.4.4)
activesupport (= 6.1.4.4)
marcel (~> 1.0.0)
activemodel (7.0.1)
activesupport (= 7.0.1)
activerecord (7.0.1)
activemodel (= 7.0.1)
activesupport (= 7.0.1)
activestorage (7.0.1)
actionpack (= 7.0.1)
activejob (= 7.0.1)
activerecord (= 7.0.1)
activesupport (= 7.0.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.4.4)
activesupport (7.0.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
amq-protocol (2.3.2)
ast (2.4.2)
attr_encrypted (3.1.0)
encryptor (~> 3.0.0)
bcrypt (3.1.16)
better_errors (2.9.1)
coderay (>= 1.0.0)
Expand All @@ -86,8 +85,6 @@ GEM
bunny-pub-sub (0.5.2)
bunny (~> 2.14)
byebug (11.1.3)
case_transform (0.2)
activesupport
ci_reporter (2.0.0)
builder (>= 2.1.2)
code_analyzer (0.5.2)
Expand All @@ -103,7 +100,7 @@ GEM
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
devise (4.7.3)
devise (4.8.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
Expand Down Expand Up @@ -138,7 +135,6 @@ GEM
dry-core (~> 0.5, >= 0.5)
dry-inflector (~> 0.1, >= 0.1.2)
dry-logic (~> 1.0, >= 1.0.2)
encryptor (3.0.0)
erubi (1.10.0)
erubis (2.7.0)
factory_bot (6.2.0)
Expand All @@ -158,9 +154,6 @@ GEM
mustermann-grape (~> 1.0.0)
rack (>= 1.3.0)
rack-accept
grape-active_model_serializers (1.3.2)
active_model_serializers (>= 0.9.0)
grape
grape-entity (0.10.1)
activesupport (>= 3.0.0)
multi_json (>= 1.3.2)
Expand All @@ -186,7 +179,6 @@ GEM
multi_json (>= 1.3)
securecompare
url_safe_base64
jsonapi-renderer (0.2.2)
listen (3.7.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand All @@ -204,9 +196,6 @@ GEM
minitest (5.15.0)
minitest-around (0.5.0)
minitest (~> 5.0)
minitest-rails (6.1.0)
minitest (~> 5.10)
railties (~> 6.1.0)
moss_ruby (1.1.3)
msgpack (1.4.2)
multi_json (1.15.0)
Expand All @@ -215,7 +204,15 @@ GEM
mustermann-grape (1.0.1)
mustermann (>= 1.0.0)
mysql2 (0.5.3)
net-imap (0.2.3)
digest
net-protocol
strscan
net-ldap (0.17.0)
net-pop (0.1.1)
digest
net-protocol
timeout
net-protocol (0.1.2)
io-wait
timeout
Expand All @@ -242,21 +239,20 @@ GEM
rack (>= 2.0.0)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.1.4.4)
actioncable (= 6.1.4.4)
actionmailbox (= 6.1.4.4)
actionmailer (= 6.1.4.4)
actionpack (= 6.1.4.4)
actiontext (= 6.1.4.4)
actionview (= 6.1.4.4)
activejob (= 6.1.4.4)
activemodel (= 6.1.4.4)
activerecord (= 6.1.4.4)
activestorage (= 6.1.4.4)
activesupport (= 6.1.4.4)
rails (7.0.1)
actioncable (= 7.0.1)
actionmailbox (= 7.0.1)
actionmailer (= 7.0.1)
actionpack (= 7.0.1)
actiontext (= 7.0.1)
actionview (= 7.0.1)
activejob (= 7.0.1)
activemodel (= 7.0.1)
activerecord (= 7.0.1)
activestorage (= 7.0.1)
activesupport (= 7.0.1)
bundler (>= 1.15.0)
railties (= 6.1.4.4)
sprockets-rails (>= 2.0.0)
railties (= 7.0.1)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
Expand All @@ -272,12 +268,13 @@ GEM
json
require_all (~> 3.0)
ruby-progressbar
railties (6.1.4.4)
actionpack (= 6.1.4.4)
activesupport (= 6.1.4.4)
railties (7.0.1)
actionpack (= 7.0.1)
activesupport (= 7.0.1)
method_source
rake (>= 0.13)
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.0.0)
rake (13.0.6)
rb-fsevent (0.11.0)
Expand Down Expand Up @@ -317,11 +314,11 @@ GEM
rubocop-faker (1.1.0)
faker (>= 2.12.0)
rubocop (>= 0.82.0)
rubocop-rails (2.13.0)
rubocop-rails (2.13.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.7.0, < 2.0)
ruby-filemagic (0.7.2)
ruby-filemagic (0.7.3)
ruby-ole (1.2.12.2)
ruby-progressbar (1.11.0)
ruby-saml (1.13.0)
Expand Down Expand Up @@ -350,6 +347,7 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
strscan (3.0.1)
thor (1.2.1)
timeout (0.2.0)
tzinfo (2.0.4)
Expand All @@ -374,39 +372,35 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
active_model_serializers (~> 0.10.0)
attr_encrypted (~> 3.1.0)
better_errors
bootsnap (>= 1.4.4)
bunny-pub-sub (= 0.5.2)
byebug
ci_reporter
coderay
database_cleaner
devise (~> 4.7.1)
devise
devise_ldap_authenticatable
dotenv-rails
factory_bot
factory_bot_rails
faker
grape
grape-active_model_serializers (~> 1.3.2)
grape-entity
grape-swagger
grape-swagger-rails
hirb
icalendar (~> 2.5, >= 2.5.3)
json-jwt (= 1.7.0)
listen
minitest (~> 5.14)
minitest
minitest-around
minitest-rails
moss_ruby (>= 1.1.2)
mysql2 (~> 0.5.0)
net-smtp
puma (~> 5.5)
rack-cors
rails (~> 6.1.0)
rails (~> 7.0.0)
rails-latex (> 2.3)
rails_best_practices
require_all (>= 1.3.3)
Expand All @@ -421,6 +415,7 @@ DEPENDENCIES
ruby-saml (~> 1.13.0)
rubyzip
simplecov
sprockets-rails
webmock

RUBY VERSION
Expand Down
Loading

0 comments on commit 12b17dd

Please sign in to comment.