Merge pull request #59 from ZeusWPI/update-rails

Update rails to latest 5
This commit is contained in:
redfast00 2019-08-24 21:25:24 +02:00 committed by GitHub
commit b54433f3d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 39 deletions

View file

@ -5,7 +5,7 @@ gem 'bcrypt_pbkdf'
gem "ed25519" gem "ed25519"
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '5.2.0' gem 'rails', '5.2.3'
# Use sqlite3 as the database for Active Record # Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.3.13' gem 'sqlite3', '~> 1.3.13'
# Use SCSS for stylesheets # Use SCSS for stylesheets

View file

@ -1,43 +1,43 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (5.2.0) actioncable (5.2.3)
actionpack (= 5.2.0) actionpack (= 5.2.3)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailer (5.2.0) actionmailer (5.2.3)
actionpack (= 5.2.0) actionpack (= 5.2.3)
actionview (= 5.2.0) actionview (= 5.2.3)
activejob (= 5.2.0) activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.2.0) actionpack (5.2.3)
actionview (= 5.2.0) actionview (= 5.2.3)
activesupport (= 5.2.0) activesupport (= 5.2.3)
rack (~> 2.0) rack (~> 2.0)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.0) actionview (5.2.3)
activesupport (= 5.2.0) activesupport (= 5.2.3)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3) rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.0) activejob (5.2.3)
activesupport (= 5.2.0) activesupport (= 5.2.3)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.2.0) activemodel (5.2.3)
activesupport (= 5.2.0) activesupport (= 5.2.3)
activerecord (5.2.0) activerecord (5.2.3)
activemodel (= 5.2.0) activemodel (= 5.2.3)
activesupport (= 5.2.0) activesupport (= 5.2.3)
arel (>= 9.0) arel (>= 9.0)
activestorage (5.2.0) activestorage (5.2.3)
actionpack (= 5.2.0) actionpack (= 5.2.3)
activerecord (= 5.2.0) activerecord (= 5.2.3)
marcel (~> 0.3.1) marcel (~> 0.3.1)
activesupport (5.2.0) activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@ -205,18 +205,18 @@ GEM
rack (2.0.7) rack (2.0.7)
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (5.2.0) rails (5.2.3)
actioncable (= 5.2.0) actioncable (= 5.2.3)
actionmailer (= 5.2.0) actionmailer (= 5.2.3)
actionpack (= 5.2.0) actionpack (= 5.2.3)
actionview (= 5.2.0) actionview (= 5.2.3)
activejob (= 5.2.0) activejob (= 5.2.3)
activemodel (= 5.2.0) activemodel (= 5.2.3)
activerecord (= 5.2.0) activerecord (= 5.2.3)
activestorage (= 5.2.0) activestorage (= 5.2.3)
activesupport (= 5.2.0) activesupport (= 5.2.3)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 5.2.0) railties (= 5.2.3)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.4) rails-controller-testing (1.0.4)
actionpack (>= 5.0.1.x) actionpack (>= 5.0.1.x)
@ -227,12 +227,12 @@ GEM
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.2.0) rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2) loofah (~> 2.2, >= 2.2.2)
railties (5.2.0) railties (5.2.3)
actionpack (= 5.2.0) actionpack (= 5.2.3)
activesupport (= 5.2.0) activesupport (= 5.2.3)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.19.0, < 2.0)
rainbow (3.0.0) rainbow (3.0.0)
rake (12.3.3) rake (12.3.3)
rb-fsevent (0.10.3) rb-fsevent (0.10.3)
@ -372,7 +372,7 @@ DEPENDENCIES
mysql2 (>= 0.4.4, < 0.6.0) mysql2 (>= 0.4.4, < 0.6.0)
omniauth-oauth2 (~> 1.3.1) omniauth-oauth2 (~> 1.3.1)
purecss-rails purecss-rails
rails (= 5.2.0) rails (= 5.2.3)
rails-controller-testing rails-controller-testing
react-rails (~> 1.10.0) react-rails (~> 1.10.0)
rolify rolify