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.

Sign up for GitHub

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

Jump to bottom

Bump rails_admin from 1.4.3 to 2.3.0 #690

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump rails_admin from 1.4.3 to 2.3.0 #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ gem 'capistrano-rbenv'
gem 'carrierwave', '~> 2.2'
gem 'devise'
gem 'flipclockjs-rails', '~> 0.7.7'
gem 'rails_admin', '~> 1.4'
gem 'rails_admin', '~> 2.3'
gem 'rails-controller-testing'
gem 'react-rails'
gem 'rmagick', '~> 5.3'
Expand Down
104 changes: 64 additions & 40 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ GEM
globalid (>= 0.3.6)
activemodel (5.2.8.1)
activesupport (= 5.2.8.1)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (5.2.8.1)
activemodel (= 5.2.8.1)
activesupport (= 5.2.8.1)
Expand All @@ -69,13 +73,14 @@ GEM
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
base64 (0.2.0)
bcrypt (3.1.16)
bindex (0.8.1)
bond (0.5.1)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
builder (3.2.4)
builder (3.3.0)
byebug (11.1.3)
capistrano (3.16.0)
airbrussh (>= 1.0.0)
Expand Down Expand Up @@ -119,7 +124,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.3)
connection_pool (2.2.5)
coveralls (0.7.1)
multi_json (~> 1.3)
Expand All @@ -130,6 +135,7 @@ GEM
crack (0.4.5)
rexml
crass (1.0.6)
date (3.3.4)
devise (4.7.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -143,9 +149,9 @@ GEM
docile (1.3.5)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
erubi (1.11.0)
erubi (1.13.0)
excon (0.80.1)
execjs (2.7.0)
execjs (2.9.1)
factory_bot (6.1.0)
activesupport (>= 5.0.0)
factory_bot_rails (6.1.0)
Expand All @@ -167,11 +173,9 @@ GEM
fileutils (1.7.0)
flipclockjs-rails (0.7.7)
jquery-rails (>= 1.0.17)
font-awesome-rails (4.7.0.7)
railties (>= 3.2, < 7)
globalid (1.1.0)
activesupport (>= 5.0)
haml (5.2.1)
haml (5.2.2)
temple (>= 0.8.0)
tilt
hashdiff (1.0.1)
Expand All @@ -188,7 +192,7 @@ GEM
http-form_data (2.3.0)
http-parser (1.2.3)
ffi-compiler (>= 1.0, < 2.0)
i18n (1.14.4)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
Expand All @@ -206,18 +210,18 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
kaminari (1.2.1)
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.1)
kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.1)
kaminari-actionview (1.2.1)
kaminari-actionview (= 1.2.2)
kaminari-activerecord (= 1.2.2)
kaminari-core (= 1.2.2)
kaminari-actionview (1.2.2)
actionview
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
kaminari-core (= 1.2.2)
kaminari-activerecord (1.2.2)
activerecord
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
libhoney (1.18.0)
addressable (~> 2.0)
excon
Expand All @@ -233,26 +237,38 @@ GEM
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
marcel (1.0.4)
method_source (1.0.0)
method_source (1.1.0)
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.1003)
mini_magick (4.12.0)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.22.3)
mini_portile2 (2.8.7)
minitest (5.24.1)
multi_json (1.15.0)
multipart-post (2.1.1)
mysql2 (0.5.4)
nested_form (0.3.2)
net-imap (0.4.14)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-smtp (0.5.0)
net-protocol
net-ssh (6.1.0)
netrc (0.11.0)
nio4r (2.5.9)
nio4r (2.7.3)
nokogiri (1.15.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
Expand All @@ -274,7 +290,7 @@ GEM
public_suffix (5.0.4)
puma (5.6.7)
nio4r (~> 2.0)
racc (1.7.3)
racc (1.8.0)
rack (2.2.9)
rack-honeycomb (0.5.0)
libhoney (>= 1.5.0)
Expand All @@ -283,7 +299,7 @@ GEM
rack (>= 1.1)
rack-proxy (0.7.2)
rack
rack-test (2.0.2)
rack-test (2.1.0)
rack (>= 1.3)
rails (5.2.8.1)
actioncable (= 5.2.8.1)
Expand All @@ -302,34 +318,34 @@ GEM
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
activesupport (>= 5.0.1.rc1)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
rails_admin (1.4.3)
rails_admin (2.3.0)
activemodel-serializers-xml (>= 1.0)
builder (~> 3.1)
coffee-rails (~> 4.0)
font-awesome-rails (>= 3.0, < 5)
haml (>= 4.0, < 6)
jquery-rails (>= 3.0, < 5)
jquery-ui-rails (>= 5.0, < 7)
kaminari (>= 0.14, < 2.0)
nested_form (~> 0.3)
rack-pjax (>= 0.7)
rails (>= 4.0, < 6)
rails (>= 5.0, < 7)
remotipart (~> 1.3)
sass-rails (>= 4.0, < 6)
sassc-rails (>= 1.3, < 3)
railties (5.2.8.1)
actionpack (= 5.2.8.1)
activesupport (= 5.2.8.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (13.0.6)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
react-rails (2.6.1)
babel-transpiler (>= 0.7.0)
Expand Down Expand Up @@ -405,6 +421,12 @@ GEM
tilt (>= 1.1, < 3)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
semantic_range (3.0.0)
simple_form (5.1.0)
actionpack (>= 5.2)
Expand All @@ -415,7 +437,8 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.2)
sprockets (3.7.2)
sprockets (3.7.3)
base64
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.2)
Expand All @@ -428,12 +451,13 @@ GEM
net-ssh (>= 2.8.0)
ssrf_filter (1.1.2)
sync (0.5.0)
temple (0.8.2)
temple (0.10.3)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (1.2.1)
thor (1.3.1)
thread_safe (0.3.6)
tilt (2.0.10)
tilt (2.4.0)
timeout (0.4.1)
tins (1.28.0)
sync
turbolinks (5.2.1)
Expand Down Expand Up @@ -463,7 +487,7 @@ GEM
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
websocket-driver (0.7.5)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
Expand Down Expand Up @@ -511,7 +535,7 @@ DEPENDENCIES
rack-honeycomb (~> 0.5.0)
rails (~> 5.2.8.1)
rails-controller-testing
rails_admin (~> 1.4)
rails_admin (~> 2.3)
react-rails
redis (~> 3.0)
rmagick (~> 5.3)
Expand Down