diff --git a/Gemfile b/Gemfile index fdffdb31c..bcaf18999 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.1.9' +gem 'rails', '4.1.10' gem 'activeadmin', github: 'activeadmin' gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 52a43a070..0a8f89a6a 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.9) - actionpack (= 4.1.9) - actionview (= 4.1.9) + actionmailer (4.1.10) + actionpack (= 4.1.10) + actionview (= 4.1.10) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.9) - actionview (= 4.1.9) - activesupport (= 4.1.9) + actionpack (4.1.10) + actionview (= 4.1.10) + activesupport (= 4.1.10) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.9) - activesupport (= 4.1.9) + actionview (4.1.10) + activesupport (= 4.1.10) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.9) - activesupport (= 4.1.9) + activemodel (4.1.10) + activesupport (= 4.1.10) builder (~> 3.1) - activerecord (4.1.9) - activemodel (= 4.1.9) - activesupport (= 4.1.9) + activerecord (4.1.10) + activemodel (= 4.1.10) + activesupport (= 4.1.10) arel (~> 5.0.0) - activesupport (4.1.9) + activesupport (4.1.10) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -276,7 +276,7 @@ GEM railties (>= 3.0.0, < 5.0.0) mime-types (1.25.1) mini_portile (0.6.2) - minitest (5.5.1) + minitest (5.6.0) mock_redis (0.14.0) momentjs-rails (2.9.0) railties (>= 3.1) @@ -358,24 +358,24 @@ GEM rack (>= 1.0.0) rack-utf8_sanitizer (1.3.0) rack (~> 1.0) - rails (4.1.9) - actionmailer (= 4.1.9) - actionpack (= 4.1.9) - actionview (= 4.1.9) - activemodel (= 4.1.9) - activerecord (= 4.1.9) - activesupport (= 4.1.9) + 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) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.9) + railties (= 4.1.10) 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.9) - actionpack (= 4.1.9) - activesupport (= 4.1.9) + railties (4.1.10) + actionpack (= 4.1.10) + activesupport (= 4.1.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) @@ -531,7 +531,7 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.5) tilt (1.4.1) time_diff (0.3.0) activesupport @@ -634,7 +634,7 @@ DEPENDENCIES pundit rack-throttle (~> 0.3.0) rack-utf8_sanitizer - rails (= 4.1.9) + rails (= 4.1.10) rails-assets-notifyjs! rails3-generators rails3-jquery-autocomplete