diff --git a/Gemfile b/Gemfile index a891340..3a4d257 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem 'autoprefixer-rails' # gem 'bootstrap-sass' gem 'bootstrap-sass', '>= 3.4.1' # gem 'jquery-rails', '~> 4.2.1' -gem 'jquery-rails', '~> 3.1.4' +gem 'jquery-rails', '~> 4.4.0' gem 'jquery-ui-rails', '< 5.0.0'#, '~> 4.1.1' gem 'bootstrap-datepicker-rails' gem 'twitter-bootstrap-rails-confirm' diff --git a/Gemfile.lock b/Gemfile.lock index 19f8a50..1a89bfa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -197,7 +197,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.9) + concurrent-ruby (1.2.2) connection_pool (2.2.5) crack (0.4.3) safe_yaml (~> 1.0.0) @@ -396,8 +396,9 @@ GEM railties (>= 3.2, < 5) responders ipaddress (0.8.3) - jquery-rails (3.1.4) - railties (>= 3.0, < 5.0) + jquery-rails (4.4.0) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) railties (>= 3.2.16) @@ -421,7 +422,7 @@ GEM launchy (2.4.3) addressable (~> 2.3) libv8 (3.16.14.19) - loofah (2.9.0) + loofah (2.20.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -460,7 +461,7 @@ GEM mini_magick (4.11.0) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.3) + minitest (5.18.0) multi_json (1.12.1) multipart-post (2.0.0) mysql2 (0.5.3) @@ -537,14 +538,14 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.11.3) sprockets-rails - rails-deprecated_sanitizer (1.0.3) + rails-deprecated_sanitizer (1.0.4) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.9) activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.3.0) - loofah (~> 2.3) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) rails3-jquery-autocomplete (1.0.15) rails (>= 3.2) rails_best_practices (1.17.0) @@ -688,7 +689,7 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.0.1) + thor (1.2.1) thread_safe (0.3.6) tilt (2.0.10) trollop (2.1.2) @@ -696,7 +697,7 @@ GEM twitter-bootstrap-rails-confirm (1.0.6) typhoeus (1.1.0) ethon (>= 0.9.0) - tzinfo (1.2.9) + tzinfo (1.2.11) thread_safe (~> 0.1) uglifier (3.0.2) execjs (>= 0.3.0, < 3) @@ -780,7 +781,7 @@ DEPENDENCIES htmlentities (~> 4.3.3) ims-lti! inherited_resources - jquery-rails (~> 3.1.4) + jquery-rails (~> 4.4.0) jquery-ui-rails (< 5.0.0) json_spec kaminari (>= 1.2.1)