diff --git a/Gemfile b/Gemfile index 57bdd57c9..5a1ed1b15 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem 'country_select', '~> 1.3.1' gem 'redcarpet', '~> 3.5.1' gem 'coderay', '~> 1.1' gem 'bootstrap-multiselect-rails', '~> 0.9.9' -gem 'active_model_serializers', '~> 0.10.0' +gem 'active_model_serializers', '~> 0.10.14' gem 'draper', '3.0.0.pre1' gem 'simple_form', '~> 5.0.3' gem 'zeroclipboard-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 1a26e548c..dc685c57f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,10 @@ GEM - remote: https://rubygems.org/ remote: https://rails-assets.org/ + specs: + rails-assets-momentjs (2.17.1) + +GEM + remote: https://rubygems.org/ specs: actioncable (5.0.5) actionpack (= 5.0.5) @@ -27,10 +31,11 @@ GEM rails-html-sanitizer (~> 1.0, >= 1.0.3) actionview-encoded_mail_to (1.0.9) rails - active_model_serializers (0.10.3) - actionpack (>= 4.1, < 6) - activemodel (>= 4.1, < 6) - jsonapi (= 0.1.1.beta2) + active_model_serializers (0.10.14) + actionpack (>= 4.1) + activemodel (>= 4.1) + case_transform (>= 0.2) + jsonapi-renderer (>= 0.1.1.beta1, < 0.3) activejob (5.0.5) activesupport (= 5.0.5) globalid (>= 0.3.6) @@ -79,10 +84,12 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (>= 2.0, < 4.0) + case_transform (0.2) + activesupport chartkick (2.2.1) childprocess (3.0.0) coderay (1.1.3) - concurrent-ruby (1.1.9) + concurrent-ruby (1.2.2) countries (0.9.3) currencies (~> 0.4.2) country_select (1.3.1) @@ -199,9 +206,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (1.8.6) - jsonapi (0.1.1.beta2) - json (~> 1.8) + jsonapi-renderer (0.2.2) jwt (2.3.0) launchy (2.4.3) addressable (~> 2.3) @@ -209,7 +214,7 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.13.0) + loofah (2.21.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.10) @@ -221,7 +226,7 @@ GEM mime-types-data (3.2016.0521) mini_mime (1.0.2) mini_portile2 (2.1.0) - minitest (5.15.0) + minitest (5.20.0) multi_json (1.12.1) multi_xml (0.6.0) multipart-post (2.1.1) @@ -273,7 +278,7 @@ GEM nio4r (~> 2.0) pundit (1.1.0) activesupport (>= 3.0.0) - rack (2.2.3) + rack (2.2.8) rack-mini-profiler (0.10.1) rack (>= 1.2.0) rack-test (0.6.3) @@ -291,16 +296,16 @@ GEM bundler (>= 1.3.0) railties (= 5.0.5) sprockets-rails (>= 2.0.0) - rails-assets-momentjs (2.17.1) rails-controller-testing (1.0.5) 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.4.2) - loofah (~> 2.3) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging @@ -380,7 +385,7 @@ GEM thread_safe (0.3.6) tilt (2.0.5) timecop (0.8.1) - tzinfo (1.2.9) + tzinfo (1.2.11) thread_safe (~> 0.1) warden (1.2.9) rack (>= 2.0.9) @@ -406,7 +411,7 @@ PLATFORMS DEPENDENCIES actionview-encoded_mail_to - active_model_serializers (~> 0.10.0) + active_model_serializers (~> 0.10.14) annotate better_errors binding_of_caller