diff --git a/Gemfile b/Gemfile index b4aaff2..b7c3c19 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'unicorn' gem 'unicorn-rails' gem 'uglifier', '>= 1.3.0' gem 'devise', '~> 3.5.0' -gem 'rails_admin', '~> 0.6.7' +gem 'rails_admin', '~> 1.4.3' gem 'active_model_serializers', '~> 0.9.3' gem "pundit" gem 'net-ssh' diff --git a/Gemfile.lock b/Gemfile.lock index 99da71b..f308d30 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM rack (>= 0.9.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - builder (3.2.3) + builder (3.2.4) byebug (10.0.2) carrierwave (1.2.3) activemodel (>= 4.0.0) @@ -75,12 +75,12 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.7) config (1.7.0) activesupport (>= 3.0) deep_merge (~> 1.2.1) dry-validation (>= 0.10.4) - crass (1.0.4) + crass (1.0.6) database_cleaner (1.4.1) date_validator (0.9.0) activemodel @@ -148,7 +148,7 @@ GEM multipart-post (>= 1.2, < 3) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - ffi (1.9.25) + ffi (1.14.2) fission (0.5.0) CFPropertyList (~> 2.2) fog (1.31.0) @@ -243,10 +243,10 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.4) - railties (>= 3.2, < 6.0) + font-awesome-rails (4.7.0.6) + railties (>= 3.2, < 6.2) formatador (0.2.5) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) google-api-client (0.23.9) addressable (~> 2.5, >= 2.5.1) @@ -277,7 +277,8 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - haml (4.0.7) + haml (5.2.1) + temple (>= 0.8.0) tilt httpclient (2.8.3) i18n (0.9.5) @@ -286,23 +287,32 @@ GEM jbuilder (2.8.0) activesupport (>= 4.2.0) multi_json (>= 1.2) - jquery-rails (4.3.3) + 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 (1.8.6) jwt (2.1.0) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + kaminari (1.2.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.1) + kaminari-activerecord (= 1.2.1) + kaminari-core (= 1.2.1) + kaminari-actionview (1.2.1) + actionview + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) + activerecord + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) kgio (2.11.2) listen (3.1.5) 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) lumberjack (1.0.13) @@ -317,16 +327,16 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) mini_magick (4.9.2) - mini_mime (1.0.1) - mini_portile2 (2.3.0) - minitest (5.11.3) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.3) multi_json (1.13.1) multipart-post (2.0.0) nenv (0.3.0) nested_form (0.3.2) net-ssh (5.0.2) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) @@ -344,10 +354,10 @@ GEM activesupport (>= 3.0.0) rabl (0.11.8) activesupport (>= 2.3.14) - rack (1.6.11) - rack-pjax (0.8.0) + rack (1.6.13) + 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.3) @@ -367,24 +377,23 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_admin (0.6.8) + rails_admin (1.4.3) builder (~> 3.1) coffee-rails (~> 4.0) font-awesome-rails (>= 3.0, < 5) - haml (~> 4.0) + haml (>= 4.0, < 6) jquery-rails (>= 3.0, < 5) - jquery-ui-rails (~> 5.0) - kaminari (~> 0.14) + jquery-ui-rails (>= 5.0, < 7) + kaminari (>= 0.14, < 2.0) nested_form (~> 0.3) - rack-pjax (~> 0.7) - rails (~> 4.0) - remotipart (~> 1.0) - safe_yaml (~> 1.0) + rack-pjax (>= 0.7) + rails (>= 4.0, < 6) + remotipart (~> 1.3) sass-rails (>= 4.0, < 6) rails_config (0.99.0) config (>= 1.0.0.beta1) @@ -396,13 +405,13 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.19.0) - rake (12.3.1) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rake (13.0.3) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) rdoc (4.3.0) recursive-open-struct (0.6.5) - remotipart (1.4.2) + remotipart (1.4.4) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -433,8 +442,7 @@ GEM rspec-support (~> 3.8.0) rspec-support (3.8.0) ruby_dep (1.5.0) - safe_yaml (1.0.4) - sass (3.7.2) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -466,16 +474,17 @@ GEM sprockets (3.7.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.2) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) - thor (0.20.3) + 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) uber (0.1.0) uglifier (4.1.19) @@ -490,6 +499,7 @@ GEM warden (1.2.7) rack (>= 1.0) xml-simple (1.1.5) + xmlrpc (0.3.1) PLATFORMS ruby @@ -523,7 +533,7 @@ DEPENDENCIES rabl (~> 0.11.0) rails (= 4.2.3) rails_12factor - rails_admin (~> 0.6.7) + rails_admin (~> 1.4.3) rails_config recursive-open-struct (~> 0.6.3) rspec @@ -536,6 +546,7 @@ DEPENDENCIES unicorn unicorn-rails vcr + xmlrpc RUBY VERSION ruby 2.2.6p396