Skip to content

Commit

Permalink
Upgrade rails_admin from 1.0.0 to 1.1.1 and devise
Browse files Browse the repository at this point in the history
Devise upgrade is needed to avoid issue with ruby 5.0

The issue is documented here

heartcombo/devise#4630
  • Loading branch information
sanchojaf committed Mar 24, 2019
1 parent bb58fe8 commit d731d25
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 21 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -10,7 +10,7 @@ gem 'bootstrap-sass'
#gem 'turbolinks'
gem 'therubyracer', platforms: :ruby
gem 'jbuilder'
gem 'devise'
gem 'devise', git: 'https://github.com/plataformatec/devise.git', branch: '3-stable'
gem 'rabl'
gem 'builder'
gem 'haml-rails'
Expand Down Expand Up @@ -53,7 +53,7 @@ end

gem 'mongoid'
gem 'bson_ext'
gem 'rails_admin', '~> 1.0.0'
gem 'rails_admin', '~> 1.1.1'

# charts
gem 'rails_admin_dynamic_charts', git: 'https://github.com/openjaf/rails_admin_dynamic_charts.git'
Expand Down
45 changes: 26 additions & 19 deletions Gemfile.lock
Expand Up @@ -76,6 +76,19 @@ GIT
rails (>= 3.2)
rails_admin (> 0)

GIT
remote: https://github.com/plataformatec/devise.git
revision: bddf051bfb4213114a3531708ccd68729c4ecef9
branch: 3-stable
specs:
devise (3.5.10)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -127,7 +140,7 @@ GEM
aws-sdk-resources (2.10.13)
aws-sdk-core (= 2.10.13)
aws-sigv4 (1.0.1)
bcrypt (3.1.10)
bcrypt (3.1.12)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
Expand Down Expand Up @@ -194,13 +207,6 @@ GEM
rails (>= 4.1)
rainbow (>= 2.1.0)
descriptive_statistics (2.5.1)
devise (3.5.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.2.5)
diffy (3.2.0)
dig_rb (1.0.1)
Expand Down Expand Up @@ -275,7 +281,7 @@ GEM
json-schema (2.5.1)
addressable (~> 2.3.7)
jwt (2.1.0)
kaminari (0.16.3)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.10.0)
Expand Down Expand Up @@ -359,9 +365,9 @@ GEM
rabl (0.11.6)
activesupport (>= 2.3.14)
rack (1.6.11)
rack-pjax (0.8.0)
rack-pjax (1.1.0)
nokogiri (~> 1.5)
rack (~> 1.1)
rack (>= 1.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.11.1)
Expand All @@ -386,7 +392,7 @@ GEM
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_admin (1.0.0)
rails_admin (1.1.1)
builder (~> 3.1)
coffee-rails (~> 4.0)
font-awesome-rails (>= 3.0, < 5)
Expand Down Expand Up @@ -418,11 +424,12 @@ GEM
recaptcha (4.3.1)
json
ref (2.0.0)
remotipart (1.3.1)
remotipart (1.4.2)
request_store (1.4.1)
rack (>= 1.4)
responders (2.1.0)
railties (>= 4.2.0, < 5)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rkelly-remix (0.0.7)
rmagick (2.15.4)
rolify (4.1.1)
Expand Down Expand Up @@ -512,7 +519,7 @@ GEM
rack
raindrops (~> 0.7)
wannabe_bool (0.3.0)
warden (1.2.3)
warden (1.2.7)
rack (>= 1.0)
wicked_pdf (1.1.0)
wkhtmltopdf-binary (0.12.3.1)
Expand Down Expand Up @@ -557,7 +564,7 @@ DEPENDENCIES
database_cleaner
deface
descriptive_statistics
devise
devise!
diffy
exception_notification
factory_girl_rails
Expand All @@ -582,7 +589,7 @@ DEPENDENCIES
mongoid-tracer!
net-scp
net-sftp
nokogiri (= 1.8.5)
nokogiri
oauth
oauth2
origami!
Expand All @@ -595,7 +602,7 @@ DEPENDENCIES
rabl
rails
rails_12factor
rails_admin (~> 1.0.0)
rails_admin (~> 1.1.1)
rails_admin_dynamic_charts!
rails_layout
recaptcha
Expand Down

0 comments on commit d731d25

Please sign in to comment.