diff --git a/Gemfile.lock b/Gemfile.lock index 2397c647..fd414eb2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,57 +1,60 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.0.0.1) - actionpack (= 5.0.0.1) + actioncable (5.0.1) + actionpack (= 5.0.1) nio4r (~> 1.2) websocket-driver (~> 0.6.1) - actionmailer (5.0.0.1) - actionpack (= 5.0.0.1) - actionview (= 5.0.0.1) - activejob (= 5.0.0.1) + actionmailer (5.0.1) + actionpack (= 5.0.1) + actionview (= 5.0.1) + activejob (= 5.0.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.0.1) - actionview (= 5.0.0.1) - activesupport (= 5.0.0.1) + actionpack (5.0.1) + actionview (= 5.0.1) + activesupport (= 5.0.1) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.1) - activesupport (= 5.0.0.1) + actionview (5.0.1) + activesupport (= 5.0.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - active_model_serializers (0.10.2) + active_model_serializers (0.10.4) actionpack (>= 4.1, < 6) activemodel (>= 4.1, < 6) - jsonapi (~> 0.1.1.beta2) - railties (>= 4.1, < 6) - activejob (5.0.0.1) - activesupport (= 5.0.0.1) + case_transform (>= 0.2) + jsonapi (= 0.1.1.beta6) + activejob (5.0.1) + activesupport (= 5.0.1) globalid (>= 0.3.6) - activemodel (5.0.0.1) - activesupport (= 5.0.0.1) - activerecord (5.0.0.1) - activemodel (= 5.0.0.1) - activesupport (= 5.0.0.1) + activemodel (5.0.1) + activesupport (= 5.0.1) + activerecord (5.0.1) + activemodel (= 5.0.1) + activesupport (= 5.0.1) arel (~> 7.0) - activesupport (5.0.0.1) + activesupport (5.0.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.3.8) - arel (7.1.2) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) + arel (7.1.4) ast (2.3.0) - aws-sdk (2.6.3) - aws-sdk-resources (= 2.6.3) - aws-sdk-core (2.6.3) + aws-sdk (2.7.0) + aws-sdk-resources (= 2.7.0) + aws-sdk-core (2.7.0) + aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.6.3) - aws-sdk-core (= 2.6.3) + aws-sdk-resources (2.7.0) + aws-sdk-core (= 2.7.0) + aws-sigv4 (1.0.0) bcrypt (3.1.11) best_in_place (3.1.0) actionpack (>= 3.2) @@ -62,21 +65,20 @@ GEM rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - brakeman (3.4.0) - builder (3.2.2) - byebug (9.0.5) - carrierwave (0.11.2) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) + brakeman (3.4.1) + builder (3.2.3) + byebug (9.0.6) + carrierwave (1.0.0) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) mime-types (>= 1.16) - mimemagic (>= 0.3.0) - climate_control (0.0.3) - activesupport (>= 3.0) + case_transform (0.2) + activesupport + climate_control (0.1.0) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.1) - concurrent-ruby (1.0.2) + concurrent-ruby (1.0.4) debug_inspector (0.0.2) delayed_job (4.1.2) activesupport (>= 3.0, < 5.1) @@ -89,23 +91,23 @@ GEM railties (>= 4.1.0, < 5.1) responders warden (~> 1.2.3) - diff-lcs (1.2.5) + diff-lcs (1.3) docile (1.1.5) doorkeeper (4.2.0) railties (>= 4.2) - dotenv (2.1.1) - dotenv-rails (2.1.1) - dotenv (= 2.1.1) - railties (>= 4.0, < 5.1) + dotenv (2.1.2) + dotenv-rails (2.1.2) + dotenv (= 2.1.2) + railties (>= 3.2, < 5.1) erubis (2.7.0) exception_notification (4.2.1) actionmailer (>= 4.0, < 6) activesupport (>= 4.0, < 6) execjs (2.7.0) - factory_girl (4.7.0) + factory_girl (4.8.0) activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) + factory_girl_rails (4.8.0) + factory_girl (~> 4.8.0) railties (>= 3.0.0) globalid (0.3.7) activesupport (>= 4.1.0) @@ -113,20 +115,32 @@ GEM multi_xml (>= 0.5.2) i18n (0.7.0) jmespath (1.3.1) - jquery-rails (4.2.1) + jquery-rails (4.2.2) 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.3) - json-schema (2.6.2) - addressable (~> 2.3.8) - jsonapi (0.1.1.beta2) - json (~> 1.8) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + json (2.0.3) + json-schema (2.7.0) + addressable (>= 2.4) + jsonapi (0.1.1.beta6) + jsonapi-parser (= 0.1.1.beta3) + jsonapi-renderer (= 0.1.1.beta1) + jsonapi-parser (0.1.1.beta3) + jsonapi-renderer (0.1.1.beta1) + kaminari (1.0.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) + actionview + kaminari-core (= 1.0.1) + kaminari-activerecord (1.0.1) + activerecord + kaminari-core (= 1.0.1) + kaminari-core (1.0.1) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.4) @@ -140,12 +154,11 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.2) mini_portile2 (2.1.0) - minitest (5.9.1) - multi_xml (0.5.5) + minitest (5.10.1) + multi_xml (0.6.0) nio4r (1.2.1) - nokogiri (1.6.8) + nokogiri (1.7.0.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) orm_adapter (0.5.0) paperclip (5.1.0) activemodel (>= 4.2.0) @@ -153,20 +166,20 @@ GEM cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) - parser (2.3.1.4) + parser (2.3.3.1) ast (~> 2.2) pg (0.19.0) - pkg-config (1.1.7) powerpack (0.1.1) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-byebug (3.4.0) + pry-byebug (3.4.2) byebug (~> 9.0) pry (~> 0.10) pry-rails (0.3.4) pry (>= 0.9.10) + public_suffix (2.0.5) puma (3.6.2) pundit (1.1.0) activesupport (>= 3.0.0) @@ -177,35 +190,35 @@ GEM rack-cors (0.4.0) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.0.1) - actioncable (= 5.0.0.1) - actionmailer (= 5.0.0.1) - actionpack (= 5.0.0.1) - actionview (= 5.0.0.1) - activejob (= 5.0.0.1) - activemodel (= 5.0.0.1) - activerecord (= 5.0.0.1) - activesupport (= 5.0.0.1) + rails (5.0.1) + actioncable (= 5.0.1) + actionmailer (= 5.0.1) + actionpack (= 5.0.1) + actionview (= 5.0.1) + activejob (= 5.0.1) + activemodel (= 5.0.1) + activerecord (= 5.0.1) + activesupport (= 5.0.1) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.1) + railties (= 5.0.1) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.1) + rails-dom-testing (2.0.2) activesupport (>= 4.2.0, < 6.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.0.0.1) - actionpack (= 5.0.0.1) - activesupport (= 5.0.0.1) + railties (5.0.1) + actionpack (= 5.0.1) + activesupport (= 5.0.1) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - rake (11.3.0) - redis (3.3.1) + rainbow (2.2.1) + rake (12.0.0) + redis (3.3.2) responders (2.3.0) railties (>= 4.2.0, < 5.1) - rspec-core (3.5.3) + rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -222,14 +235,14 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - rubocop (0.43.0) - parser (>= 2.3.1.1, < 3.0) + rubocop (0.47.1) + parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.8.1) - sass (3.4.22) + sass (3.4.23) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -243,11 +256,11 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - slack-notifier (1.5.1) + slack-notifier (2.0.0) slop (3.6.0) snorlax (0.1.6) rails (> 4.1) - sprockets (3.7.0) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.0) @@ -256,15 +269,15 @@ GEM sprockets (>= 3.0.0) sucker_punch (2.0.2) concurrent-ruby (~> 1.0.0) - thor (0.19.1) + thor (0.19.4) thread_safe (0.3.5) tilt (2.0.5) - tunemygc (1.0.68) + tunemygc (1.0.69) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.2) + uglifier (3.0.4) execjs (>= 0.3.0, < 3) - unicode-display_width (1.1.1) + unicode-display_width (1.1.3) warden (1.2.6) rack (>= 1.0) websocket-driver (0.6.4) @@ -321,4 +334,4 @@ RUBY VERSION ruby 2.3.0p0 BUNDLED WITH - 1.13.6 + 1.13.7 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 6af52fbd..4483452c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,7 +11,7 @@ // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD // GO AFTER THE REQUIRES BELOW. // -//= require jquery +//= require jquery3 //= require jquery-ui //= require jquery_ujs //= require action_cable diff --git a/app/controllers/api/v2/restful_controller.rb b/app/controllers/api/v2/restful_controller.rb index 08177ad7..4d122bc8 100644 --- a/app/controllers/api/v2/restful_controller.rb +++ b/app/controllers/api/v2/restful_controller.rb @@ -5,6 +5,7 @@ module Api include Pundit include PunditExtra + protect_from_forgery with: :exception snorlax_used_rest! before_action :load_resource, only: [:show, :update, :destroy] diff --git a/package.json b/package.json index 88005f30..104bcc5e 100644 --- a/package.json +++ b/package.json @@ -29,15 +29,15 @@ "babel-plugin-transform-class-properties": "6.22.0", "babel-preset-es2015": "6.22.0", "babel-preset-react": "6.22.0", - "backbone": "1.0.0", + "backbone": "1.3.3", "clipboard-js": "0.3.2", "commonmark": "0.27.0", "csv-parse": "1.1.10", - "emoji-mart": "0.3.5", + "emoji-mart": "0.3.7", "getscreenmedia": "2.0.0", "hark": "git://github.com/otalk/hark#342ef9b7eff2", "howler": "2.0.2", - "jquery": "1.12.4", + "jquery": "3.1.1", "json-loader": "0.5.4", "lodash": "4.17.4", "node-uuid": "1.4.7", @@ -46,7 +46,7 @@ "react-dom": "15.4.2", "react-dropzone": "3.9.1", "redux": "3.6.0", - "simplewebrtc": "2.2.1", + "simplewebrtc": "2.2.2", "socket.io": "1.3.7", "webpack": "1.14.0" },