diff --git a/Gemfile b/Gemfile index f42afb5..fba6dfb 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rack-cors' gem 'devise' gem 'simple_token_authentication' gem 'acts_as_commentable_with_threading' -gem 'rails_admin', '~> 1.2' +gem 'rails_admin', '~> 1.4' gem 'fcm' group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 183f2bb..0512fb5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,7 +46,7 @@ GEM awesome_nested_set (3.1.3) activerecord (>= 4.0.0, < 5.2) bcrypt (3.1.13) - builder (3.2.3) + builder (3.2.4) byebug (9.0.6) coffee-rails (4.2.2) coffee-script (>= 2.2.0) @@ -55,25 +55,25 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) - crass (1.0.5) + concurrent-ruby (1.1.7) + crass (1.0.6) devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - erubi (1.9.0) + erubi (1.10.0) execjs (2.7.0) fcm (0.0.2) httparty json - ffi (1.11.2) - font-awesome-rails (4.7.0.2) - railties (>= 3.2, < 5.2) - globalid (0.4.0) + ffi (1.14.2) + font-awesome-rails (4.7.0.6) + railties (>= 3.2, < 6.2) + globalid (0.4.2) activesupport (>= 4.2.0) - haml (5.0.2) + haml (5.2.1) temple (>= 0.8.0) tilt httparty (0.15.6) @@ -83,53 +83,53 @@ GEM jbuilder (2.7.0) activesupport (>= 4.2.0) multi_json (>= 1.2) - jquery-rails (4.3.1) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.1.0) - kaminari (1.0.1) + kaminari (1.2.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.0.1) - kaminari-activerecord (= 1.0.1) - kaminari-core (= 1.0.1) - kaminari-actionview (1.0.1) + kaminari-actionview (= 1.2.1) + kaminari-activerecord (= 1.2.1) + kaminari-core (= 1.2.1) + kaminari-actionview (1.2.1) actionview - kaminari-core (= 1.0.1) - kaminari-activerecord (1.0.1) + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) activerecord - kaminari-core (= 1.0.1) - kaminari-core (1.0.1) + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.3.1) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.9.2) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.4.0) - minitest (5.13.0) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (1.0.0) + mini_mime (1.0.2) + mini_portile2 (2.5.0) + minitest (5.14.3) multi_json (1.12.1) multi_xml (0.6.0) nested_form (0.3.2) - nio4r (2.1.0) - nokogiri (1.10.5) - mini_portile2 (~> 2.4.0) + nio4r (2.5.4) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) orm_adapter (0.5.0) pg (0.21.0) puma (3.9.1) - rack (2.0.7) + racc (1.5.2) + rack (2.2.3) rack-cors (1.0.5) rack (>= 1.6.0) - rack-pjax (1.0.0) + rack-pjax (1.1.0) nokogiri (~> 1.5) rack (>= 1.1) rack-test (0.6.3) @@ -151,13 +151,13 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - rails_admin (1.2.0) + rails_admin (1.4.3) 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) + jquery-ui-rails (>= 5.0, < 7) kaminari (>= 0.14, < 2.0) nested_form (~> 0.3) rack-pjax (>= 0.7) @@ -170,26 +170,25 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (13.0.1) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - remotipart (1.3.1) + rake (13.0.3) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + remotipart (1.4.4) responders (3.0.0) actionpack (>= 5.0) railties (>= 5.0) ruby_dep (1.5.0) - sass (3.5.1) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.6) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + sass-rails (6.0.0.beta3) + sassc-rails (~> 2.1, >= 2.1.1) + 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 simple_token_authentication (1.15.1) actionmailer (>= 3.2.6, < 6) actionpack (>= 3.2.6, < 6) @@ -199,25 +198,25 @@ GEM spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (3.7.2) + sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - temple (0.8.0) - thor (0.20.3) + temple (0.8.2) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.8) - tzinfo (1.2.5) + tilt (2.0.10) + tzinfo (1.2.9) thread_safe (~> 0.1) warden (1.2.8) rack (>= 2.0.6) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.5) PLATFORMS ruby @@ -233,7 +232,7 @@ DEPENDENCIES puma (~> 3.7) rack-cors rails (~> 5.1.2) - rails_admin (~> 1.2) + rails_admin (~> 1.4) simple_token_authentication spring spring-watcher-listen (~> 2.0.0)