diff --git a/Gemfile b/Gemfile index eba3ac38b..9f9dd44eb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.0.11' +gem 'rails', '4.0.13' gem 'activeadmin', github: 'activeadmin' gem 'pg', '~> 0.17.1' diff --git a/Gemfile.lock b/Gemfile.lock index 84513b461..50b46d993 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -53,25 +53,25 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - actionmailer (4.0.11) - actionpack (= 4.0.11) + actionmailer (4.0.13) + actionpack (= 4.0.13) mail (~> 2.5, >= 2.5.4) - actionpack (4.0.11) - activesupport (= 4.0.11) + actionpack (4.0.13) + activesupport (= 4.0.13) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.11) - activesupport (= 4.0.11) + activemodel (4.0.13) + activesupport (= 4.0.13) builder (~> 3.1.0) - activerecord (4.0.11) - activemodel (= 4.0.11) + activerecord (4.0.13) + activemodel (= 4.0.13) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.11) + activesupport (= 4.0.13) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.11) + activesupport (4.0.13) i18n (~> 0.6, >= 0.6.9) minitest (~> 4.2) multi_json (~> 1.3) @@ -358,21 +358,21 @@ GEM rack (>= 1.0) rack-throttle (0.3.0) rack (>= 1.0.0) - rails (4.0.11) - actionmailer (= 4.0.11) - actionpack (= 4.0.11) - activerecord (= 4.0.11) - activesupport (= 4.0.11) + rails (4.0.13) + actionmailer (= 4.0.13) + actionpack (= 4.0.13) + activerecord (= 4.0.13) + activesupport (= 4.0.13) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.11) + railties (= 4.0.13) sprockets-rails (~> 2.0) rails3-generators (1.0.0) railties (>= 3.0.0) rails3-jquery-autocomplete (1.0.15) rails (>= 3.2) - railties (4.0.11) - actionpack (= 4.0.11) - activesupport (= 4.0.11) + railties (4.0.13) + actionpack (= 4.0.13) + activesupport (= 4.0.13) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) @@ -616,7 +616,7 @@ DEPENDENCIES protected_attributes puma rack-throttle (~> 0.3.0) - rails (= 4.0.11) + rails (= 4.0.13) rails3-generators rails3-jquery-autocomplete rake