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

Bump activeadmin from 2.13.1 to 3.2.0 #219

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+42 −40
Open

Bump activeadmin from 2.13.1 to 3.2.0 #219

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
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ gem 'turbolinks'
gem 'uglifier', '>= 1.3.0'

# rest
gem 'activeadmin', '~> 2.4'
gem 'activeadmin', '~> 3.2'
gem 'devise'
gem 'gravatar-ultimate', '~> 2.0.0'
gem 'kaminari'
80 changes: 41 additions & 39 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -54,15 +54,15 @@ GEM
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activeadmin (2.13.1)
activeadmin (3.2.0)
arbre (~> 1.2, >= 1.2.1)
formtastic (>= 3.1, < 5.0)
formtastic_i18n (~> 0.4)
formtastic (>= 3.1)
formtastic_i18n (>= 0.4)
inherited_resources (~> 1.7)
jquery-rails (~> 4.2)
kaminari (~> 1.0, >= 1.2.1)
railties (>= 6.1, < 7.1)
ransack (>= 2.1.1, < 4)
jquery-rails (>= 4.2)
kaminari (>= 1.2.1)
railties (>= 6.1)
ransack (>= 4.0)
activejob (7.0.4.3)
activesupport (= 7.0.4.3)
globalid (>= 0.3.6)
@@ -85,9 +85,9 @@ GEM
tzinfo (~> 2.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
arbre (1.5.0)
activesupport (>= 3.0.0, < 7.1)
ruby2_keywords (>= 0.0.2, < 1.0)
arbre (1.7.0)
activesupport (>= 3.0.0)
ruby2_keywords (>= 0.0.2)
ast (2.4.2)
autoprefixer-rails (10.4.7.0)
execjs (~> 2)
@@ -145,8 +145,8 @@ GEM
nokogiri (>= 1.11.3)
railties (>= 4.2)
formatador (1.1.0)
formtastic (4.0.0)
actionpack (>= 5.2.0)
formtastic (5.0.0)
actionpack (>= 6.0.0)
formtastic_i18n (0.7.0)
globalid (1.1.0)
activesupport (>= 5.0)
@@ -171,18 +171,18 @@ GEM
guard (~> 2.0)
guard-compat (~> 1.0)
spork (>= 0.8.4)
has_scope (0.8.0)
has_scope (0.8.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
hashdiff (1.0.1)
hashie (5.0.0)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
inherited_resources (1.13.1)
actionpack (>= 5.2, < 7.1)
has_scope (~> 0.6)
railties (>= 5.2, < 7.1)
responders (>= 2, < 4)
inherited_resources (1.14.0)
actionpack (>= 6.0)
has_scope (>= 0.6)
railties (>= 6.0)
responders (>= 2)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
@@ -215,9 +215,9 @@ GEM
listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.20.0)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
nokogiri (>= 1.12.0)
lumberjack (1.2.8)
mail (2.8.1)
mini_mime (>= 0.1.1)
@@ -227,8 +227,8 @@ GEM
marcel (1.0.2)
method_source (1.0.0)
mini_mime (1.1.2)
mini_portile2 (2.8.1)
minitest (5.18.0)
mini_portile2 (2.8.5)
minitest (5.20.0)
multi_json (1.15.0)
multi_xml (0.6.0)
nenv (0.3.0)
@@ -242,8 +242,8 @@ GEM
net-smtp (0.3.3)
net-protocol
nio4r (2.5.9)
nokogiri (1.14.3)
mini_portile2 (~> 2.8.0)
nokogiri (1.15.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
@@ -278,8 +278,8 @@ GEM
public_suffix (4.0.7)
puma (5.6.7)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.7)
racc (1.7.3)
rack (2.2.8)
rack-protection (2.2.0)
rack
rack-test (2.1.0)
@@ -302,11 +302,13 @@ 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-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
@@ -320,18 +322,18 @@ GEM
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.0.6)
ransack (3.2.1)
rake (13.1.0)
ransack (4.1.1)
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
rb-fsevent (0.11.1)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (2.5.0)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.2.5)
rspec-core (3.11.0)
rspec-support (~> 3.11.0)
@@ -402,7 +404,7 @@ GEM
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.4.3)
thor (1.2.1)
thor (1.3.0)
tilt (2.0.10)
timeout (0.3.2)
turbolinks (5.2.1)
@@ -425,13 +427,13 @@ GEM
websocket-extensions (0.1.5)
xmlrpc (0.3.2)
webrick
zeitwerk (2.6.7)
zeitwerk (2.6.12)

PLATFORMS
ruby

DEPENDENCIES
activeadmin (~> 2.4)
activeadmin (~> 3.2)
binding_of_caller!
bootstrap-sass (>= 3.4.1)
bootswatch-rails