diff --git a/Gemfile b/Gemfile index d2b05e9..36a8f3b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "3.2.13" +gem "rails", "3.2.16" gem "rake", "10.0.3" diff --git a/Gemfile.lock b/Gemfile.lock index ba5d071..712fe66 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,18 @@ GIT remote: git://github.com/brianmario/mysql2.git - revision: 5ebf34171d30048ef1cc641120208b134ea401bd + revision: a9787cbb88f18d12f0b5c370c519d077ad68c862 specs: - mysql2 (0.3.12b6) + mysql2 (0.3.14) GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.13) - actionpack (= 3.2.13) - mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + actionmailer (3.2.16) + actionpack (= 3.2.16) + mail (~> 2.5.4) + actionpack (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -20,47 +20,47 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.13) - activesupport (= 3.2.13) + activemodel (3.2.16) + activesupport (= 3.2.16) builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + activerecord (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) + activeresource (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) + activesupport (3.2.16) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - arel (3.0.2) + arel (3.0.3) bcrypt-ruby (3.0.0) builder (3.0.4) - diff-lcs (1.1.3) + diff-lcs (1.2.5) dynamic_form (1.1.4) erubis (2.7.0) exception_notification (2.6.1) actionmailer (>= 3.0.4) - execjs (1.4.0) - multi_json (~> 1.0) - hike (1.2.1) + execjs (2.0.2) + hike (1.2.3) htmlentities (4.3.1) - i18n (0.6.1) + i18n (0.6.8) journey (1.0.4) - jquery-rails (2.1.4) + jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.7) - kgio (2.7.4) + json (1.8.1) + kgio (2.8.1) machinist (2.0) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.21) - multi_json (1.7.1) - nokogiri (1.5.6) + mime-types (1.25.1) + mini_portile (0.5.2) + multi_json (1.8.2) + nokogiri (1.6.0) + mini_portile (~> 0.5.0) oauth (0.4.7) polyglot (0.3.3) rack (1.4.5) @@ -70,58 +70,58 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) + rails (3.2.16) + actionmailer (= 3.2.16) + actionpack (= 3.2.16) + activerecord (= 3.2.16) + activeresource (= 3.2.16) + activesupport (= 3.2.16) bundler (~> 1.0) - railties (= 3.2.13) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) + railties (= 3.2.16) + railties (3.2.16) + actionpack (= 3.2.16) + activesupport (= 3.2.16) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - raindrops (0.10.0) + raindrops (0.12.0) rake (10.0.3) - rdiscount (1.6.8) + rdiscount (2.1.7) rdoc (3.12.2) json (~> 1.4) - riddle (1.5.4) - rspec-core (2.12.2) - rspec-expectations (2.12.1) - diff-lcs (~> 1.1.3) - rspec-mocks (2.12.1) - rspec-rails (2.12.1) + riddle (1.5.9) + rspec-core (2.14.7) + rspec-expectations (2.14.4) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.14.4) + rspec-rails (2.14.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.12.0) - rspec-expectations (~> 2.12.0) - rspec-mocks (~> 2.12.0) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.6) + sqlite3 (1.3.8) thinking-sphinx (2.0.12) activerecord (>= 3.0.3) builder (>= 2.1.2) riddle (>= 1.5.2) - thor (0.17.0) - tilt (1.3.6) - treetop (1.4.12) + thor (0.18.1) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) - uglifier (1.3.0) + tzinfo (0.3.38) + uglifier (2.3.2) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) - unicorn (4.5.0) + json (>= 1.8.0) + unicorn (4.7.0) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -140,7 +140,7 @@ DEPENDENCIES mysql2! nokogiri oauth - rails (= 3.2.13) + rails (= 3.2.16) rake (= 10.0.3) rdiscount rspec-rails (~> 2.6)