diff --git a/Gemfile b/Gemfile index 90b451db7..29cf248c2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.1.10' +gem 'rails', '4.1.11' gem 'activeadmin', github: 'activeadmin' gem 'pg' @@ -50,7 +50,7 @@ gem 'sprockets' gem 'will_paginate' gem 'meta-tags', require: 'meta_tags' gem 'haml-rails' -gem 'jquery-rails' +gem 'jquery-rails', '3.1.3' gem 'jquery-migrate-rails' gem 'ruby-haml-js' gem 'slim' diff --git a/Gemfile.lock b/Gemfile.lock index 2f2114248..d387fa7d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,27 +47,27 @@ GEM remote: https://rails-assets.org/ specs: RedCloth (4.2.9) - actionmailer (4.1.10) - actionpack (= 4.1.10) - actionview (= 4.1.10) + actionmailer (4.1.11) + actionpack (= 4.1.11) + actionview (= 4.1.11) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.10) - actionview (= 4.1.10) - activesupport (= 4.1.10) + actionpack (4.1.11) + actionview (= 4.1.11) + activesupport (= 4.1.11) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.10) - activesupport (= 4.1.10) + actionview (4.1.11) + activesupport (= 4.1.11) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.10) - activesupport (= 4.1.10) + activemodel (4.1.11) + activesupport (= 4.1.11) builder (~> 3.1) - activerecord (4.1.10) - activemodel (= 4.1.10) - activesupport (= 4.1.10) + activerecord (4.1.11) + activemodel (= 4.1.11) + activesupport (= 4.1.11) arel (~> 5.0.0) - activesupport (4.1.10) + activesupport (4.1.11) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -241,7 +241,7 @@ GEM activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) jquery-migrate-rails (1.2.1) - jquery-rails (3.1.2) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) @@ -249,7 +249,7 @@ GEM js-routes (1.0.0) railties (>= 3.2) sprockets-rails - json (1.8.2) + json (1.8.3) jwt (1.3.0) kaminari (0.16.3) actionpack (>= 3.0.0) @@ -280,12 +280,12 @@ GEM railties (>= 3.0.0, < 5.0.0) mime-types (1.25.1) mini_portile (0.6.2) - minitest (5.6.1) + minitest (5.7.0) mock_redis (0.14.0) momentjs-rails (2.9.0) railties (>= 3.1) mono_logger (1.1.0) - multi_json (1.11.0) + multi_json (1.11.1) multi_xml (0.5.5) multipart-post (2.0.0) nest (1.1.2) @@ -349,7 +349,7 @@ GEM pygments.rb (0.6.2) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.2.0) - rack (1.5.3) + rack (1.5.4) rack-contrib (1.2.0) rack (>= 0.9.1) rack-mini-profiler (0.9.3) @@ -362,24 +362,24 @@ GEM rack (>= 1.0.0) rack-utf8_sanitizer (1.3.0) rack (~> 1.0) - rails (4.1.10) - actionmailer (= 4.1.10) - actionpack (= 4.1.10) - actionview (= 4.1.10) - activemodel (= 4.1.10) - activerecord (= 4.1.10) - activesupport (= 4.1.10) + rails (4.1.11) + actionmailer (= 4.1.11) + actionpack (= 4.1.11) + actionview (= 4.1.11) + activemodel (= 4.1.11) + activerecord (= 4.1.11) + activesupport (= 4.1.11) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.10) + railties (= 4.1.11) sprockets-rails (~> 2.0) rails-assets-notifyjs (0.3.2) rails3-generators (1.0.0) railties (>= 3.0.0) rails3-jquery-autocomplete (1.0.15) rails (>= 3.2) - railties (4.1.10) - actionpack (= 4.1.10) - activesupport (= 4.1.10) + railties (4.1.11) + actionpack (= 4.1.11) + activesupport (= 4.1.11) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) @@ -614,7 +614,7 @@ DEPENDENCIES hirb jbuilder jquery-migrate-rails - jquery-rails + jquery-rails (= 3.1.3) js-routes localeapp mailcatcher @@ -639,7 +639,7 @@ DEPENDENCIES rack-mini-profiler rack-throttle (~> 0.3.0) rack-utf8_sanitizer - rails (= 4.1.10) + rails (= 4.1.11) rails-assets-notifyjs! rails3-generators rails3-jquery-autocomplete