diff --git a/Gemfile b/Gemfile index 0ad1a29..46cfe3b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.15' +gem 'rails', '3.2.17' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/Gemfile.lock b/Gemfile.lock index 98af170..f99632d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.15) - actionpack (= 3.2.15) + actionmailer (3.2.17) + actionpack (= 3.2.17) mail (~> 2.5.4) - actionpack (3.2.15) - activemodel (= 3.2.15) - activesupport (= 3.2.15) + actionpack (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,18 +14,18 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.15) - activesupport (= 3.2.15) + activemodel (3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.15) - activemodel (= 3.2.15) - activesupport (= 3.2.15) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.15) - activemodel (= 3.2.15) - activesupport (= 3.2.15) - activesupport (3.2.15) + activeresource (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + activesupport (3.2.17) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) arel (3.0.3) @@ -38,6 +38,7 @@ GEM coffee-script-source execjs coffee-script-source (1.2.0) + concurrent-ruby (1.1.5) devise (2.0.4) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) @@ -47,43 +48,44 @@ GEM execjs (1.3.0) multi_json (~> 1.0) hike (1.2.3) - i18n (0.8.1) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.6) libv8 (3.16.14.19) - mail (2.5.4) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - multi_json (1.12.1) + multi_json (1.14.0) orm_adapter (0.0.6) polyglot (0.3.5) rack (1.4.7) - rack-cache (1.7.0) + rack-cache (1.9.0) rack (>= 0.4) rack-ssl (1.3.4) rack rack-test (0.6.3) rack (>= 1.0) - rails (3.2.15) - actionmailer (= 3.2.15) - actionpack (= 3.2.15) - activerecord (= 3.2.15) - activeresource (= 3.2.15) - activesupport (= 3.2.15) + rails (3.2.17) + actionmailer (= 3.2.17) + actionpack (= 3.2.17) + activerecord (= 3.2.17) + activeresource (= 3.2.17) + activesupport (= 3.2.17) bundler (~> 1.0) - railties (= 3.2.15) - railties (3.2.15) - actionpack (= 3.2.15) - activesupport (= 3.2.15) + railties (= 3.2.17) + railties (3.2.17) + actionpack (= 3.2.17) + activesupport (= 3.2.17) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (12.0.0) + rake (13.0.0) rdoc (3.12.2) json (~> 1.4) ref (2.0.0) @@ -101,7 +103,7 @@ GEM therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (0.19.4) + thor (0.20.3) tilt (1.4.1) treetop (1.4.15) polyglot @@ -111,7 +113,7 @@ GEM execjs rails (>= 3.1) railties (>= 3.1) - tzinfo (0.3.53) + tzinfo (0.3.55) uglifier (1.2.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) @@ -128,7 +130,7 @@ DEPENDENCIES coffee-rails (~> 3.2.1) devise (~> 2.0.4) jquery-rails - rails (= 3.2.15) + rails (= 3.2.17) sass-rails (~> 3.2.3) sqlite3 (>= 1.3.6) therubyracer (>= 0.11.1)