diff --git a/Gemfile b/Gemfile index f677d29..d0c8484 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.6' +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 f83f974..bb93db9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,36 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.6) - actionpack (= 3.2.6) - mail (~> 2.4.4) - actionpack (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + actionmailer (3.2.17) + actionpack (= 3.2.17) + mail (~> 2.5.4) + actionpack (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) - rack (~> 1.4.0) + journey (~> 1.0.4) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.3) - activemodel (3.2.6) - activesupport (= 3.2.6) + sprockets (~> 2.2.1) + activemodel (3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - activesupport (3.2.6) - i18n (~> 0.6) + 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.2) + arel (3.0.3) bcrypt-ruby (3.0.1) - builder (3.0.0) + builder (3.0.4) cancan (1.6.8) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -39,6 +39,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + concurrent-ruby (1.1.5) cucumber (1.2.1) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -58,22 +59,22 @@ GEM gherkin (2.11.1) json (>= 1.4.6) hashie (1.2.0) - hike (1.2.1) + hike (1.2.3) httpauth (0.1) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) - json (1.7.3) + json (2.2.0) jwt (0.1.5) multi_json (>= 1.0) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.19) - multi_json (1.3.6) + mime-types (1.25.1) + multi_json (1.14.0) multipart-post (1.1.5) oauth (0.4.6) oauth2 (0.8.0) @@ -92,32 +93,31 @@ GEM omniauth (~> 1.0) orm_adapter (0.4.0) pg (0.14.0) - polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + polyglot (0.3.5) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.1) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.6) - actionmailer (= 3.2.6) - actionpack (= 3.2.6) - activerecord (= 3.2.6) - activeresource (= 3.2.6) - activesupport (= 3.2.6) + 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.6) - railties (3.2.6) - actionpack (= 3.2.6) - activesupport (= 3.2.6) + 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 (0.9.2.2) - rdoc (3.12) - json (~> 1.4) + rake (13.0.0) + rdoc (3.9.5) rspec (2.11.0) rspec-core (~> 2.11.0) rspec-expectations (~> 2.11.0) @@ -139,22 +139,23 @@ GEM slim (1.2.2) temple (~> 0.4.0) tilt (~> 1.3.3) - sprockets (2.1.3) + sprockets (2.2.3) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) temple (0.4.0) - thor (0.15.4) - tilt (1.3.3) - treetop (1.4.10) + thor (0.20.3) + tilt (1.3.7) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) twitter-login (0.4.3) hashie (>= 0.2.2) oauth (~> 0.4.2) yajl-ruby (>= 0.7.7) - tzinfo (0.3.33) + tzinfo (0.3.55) uglifier (1.2.6) execjs (>= 0.3.0) multi_json (~> 1.3) @@ -173,7 +174,7 @@ DEPENDENCIES jquery-rails omniauth-facebook pg - rails (= 3.2.6) + rails (= 3.2.17) rspec-rails (~> 2.11) sass-rails (~> 3.2.3) slim (~> 1.2)