diff --git a/Gemfile b/Gemfile index 0842c2b..91b77a7 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ gem 'jbuilder', '~> 2.7' # gem 'rack-cors' gem 'oauth2', '~> 1.4' -gem 'rails_admin', '~> 1.2' +gem 'rails_admin', '~> 1.4' # Pagination gem 'api-pagination', '~> 4.6', '>= 4.6.3' diff --git a/Gemfile.lock b/Gemfile.lock index 3789545..b8f7376 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,7 +42,7 @@ GEM public_suffix (>= 2.0.2, < 4.0) api-pagination (4.8.2) arel (8.0.0) - builder (3.2.3) + builder (3.2.4) byebug (11.0.1) coffee-rails (4.2.2) coffee-script (>= 2.2.0) @@ -51,8 +51,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) - crass (1.0.4) + concurrent-ruby (1.1.7) + crass (1.0.6) daemons (1.3.1) delayed_job (4.1.5) activesupport (>= 3.0, < 5.3) @@ -64,16 +64,16 @@ GEM elastic-apm (2.8.1) concurrent-ruby (~> 1.0) http (>= 3.0) - erubi (1.8.0) + erubi (1.10.0) execjs (2.7.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) - ffi (1.11.1) - font-awesome-rails (4.7.0.5) - railties (>= 3.2, < 6.1) + 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.1.1) + haml (5.2.1) temple (>= 0.8.0) tilt http (4.1.1) @@ -85,11 +85,11 @@ GEM domain_name (~> 0.5) http-form_data (2.1.1) http_parser.rb (0.6.0) - i18n (1.6.0) + i18n (1.8.7) concurrent-ruby (~> 1.0) jbuilder (2.9.1) activesupport (>= 4.2.0) - jquery-rails (4.3.3) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -112,22 +112,23 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.2.3) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - method_source (0.9.2) - mini_mime (1.0.1) - mini_portile2 (2.4.0) - minitest (5.11.3) + method_source (1.0.0) + mini_mime (1.0.2) + mini_portile2 (2.5.0) + minitest (5.14.3) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.1.1) nested_form (0.3.2) - nio4r (2.3.1) - nokogiri (1.10.3) - mini_portile2 (~> 2.4.0) + nio4r (2.5.4) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) oauth2 (1.4.1) faraday (>= 0.8, < 0.16.0) jwt (>= 1.0, < 3.0) @@ -137,7 +138,8 @@ GEM pg (0.21.0) public_suffix (3.1.0) puma (3.12.1) - rack (2.0.7) + racc (1.5.2) + rack (2.2.3) rack-pjax (1.1.0) nokogiri (~> 1.5) rack (>= 1.1) @@ -158,9 +160,9 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - rails_admin (1.4.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + rails_admin (1.4.3) builder (~> 3.1) coffee-rails (~> 4.0) font-awesome-rails (>= 3.0, < 5) @@ -179,9 +181,9 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.2) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rake (13.0.3) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) ffi (~> 1.0) redis (4.1.2) redis-actionpack (5.0.2) @@ -200,38 +202,37 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.6.0) redis (>= 2.2, < 5) - remotipart (1.4.3) + remotipart (1.4.4) ruby_dep (1.5.0) - sass (3.7.4) - 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.7) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - sprockets (3.7.2) + 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 + sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - temple (0.8.1) - thor (0.20.3) + temple (0.8.2) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.9) - tzinfo (1.2.5) + tilt (2.0.10) + tzinfo (1.2.9) thread_safe (~> 0.1) unf (0.1.4) unf_ext unf_ext (0.0.7.6) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) PLATFORMS ruby @@ -250,7 +251,7 @@ DEPENDENCIES pg (~> 0.21.0) puma (~> 3.7) rails (~> 5.1.4) - rails_admin (~> 1.2) + rails_admin (~> 1.4) redis-rails tzinfo-data