From 5feb8a123b59f377f1d0c92e94d7e5690a6935bb Mon Sep 17 00:00:00 2001 From: Brian Haberer Date: Mon, 9 Dec 2013 01:00:26 -0800 Subject: [PATCH] Updating Rails --- Gemfile | 3 +- Gemfile.lock | 128 ++++++++++++++++++++++++++------------------------- 2 files changed, 67 insertions(+), 64 deletions(-) diff --git a/Gemfile b/Gemfile index b167064..480587e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,7 @@ source 'http://rubygems.org' +ruby '2.0.0' -gem 'rails', '~> 3.2.13' +gem 'rails', '~> 3.2.16' gem 'aws-s3', '~> 0.6.3' gem 'paperclip', '~> 3.5.1' gem 'haml', '~> 4.0.3' diff --git a/Gemfile.lock b/Gemfile.lock index 1442654..549b281 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.14) - actionpack (= 3.2.14) + actionmailer (3.2.16) + actionpack (= 3.2.16) mail (~> 2.5.4) - actionpack (3.2.14) - activemodel (= 3.2.14) - activesupport (= 3.2.14) + actionpack (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,35 +14,34 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.14) - activesupport (= 3.2.14) + activemodel (3.2.16) + activesupport (= 3.2.16) builder (~> 3.0.0) - activerecord (3.2.14) - activemodel (= 3.2.14) - activesupport (= 3.2.14) + activerecord (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.14) - activemodel (= 3.2.14) - activesupport (= 3.2.14) - activesupport (3.2.14) + 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) - airbrake (3.1.12) - activesupport + airbrake (3.1.14) builder json ansi (1.4.3) - arel (3.0.2) + arel (3.0.3) aws-s3 (0.6.3) builder mime-types xml-simple - bcrypt-ruby (3.1.1) - bootstrap-sass (2.3.2.1) + bcrypt-ruby (3.1.2) + bootstrap-sass (2.3.2.2) sass (~> 3.2) builder (3.0.4) - capybara (2.1.0) + capybara (2.2.0) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -50,7 +49,7 @@ GEM xpath (~> 2.0) climate_control (0.0.3) activesupport (>= 3.0) - cocaine (0.5.1) + cocaine (0.5.3) climate_control (>= 0.0.3, < 1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -59,29 +58,28 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) - colorize (0.5.8) - coveralls (0.6.7) - colorize + coveralls (0.7.0) multi_json (~> 1.3) rest-client simplecov (>= 0.7) + term-ansicolor thor database_cleaner (0.5.2) - devise (2.2.6) + devise (2.2.8) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (~> 3.1) warden (~> 1.2.1) - diff-lcs (1.2.4) + diff-lcs (1.2.5) + docile (1.1.1) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - factory_girl (4.2.0) + execjs (2.0.2) + factory_girl (4.3.0) activesupport (>= 3.0.0) - factory_girl_rails (4.2.1) - factory_girl (~> 4.2.0) + factory_girl_rails (4.3.0) + factory_girl (~> 4.3.0) railties (>= 3.0.0) - haml (4.0.3) + haml (4.0.4) tilt haml-rails (0.4) actionpack (>= 3.1, < 4.1) @@ -89,27 +87,27 @@ GEM haml (>= 3.1, < 4.1) railties (>= 3.1, < 4.1) hike (1.2.3) - i18n (0.6.5) + i18n (0.6.9) journey (1.0.4) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.0) + json (1.8.1) lorem-ipsum-me (0.1.0) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.24) - mini_portile (0.5.1) + mime-types (1.25.1) + mini_portile (0.5.2) multi_json (1.7.9) - mysql2 (0.3.13) + mysql2 (0.3.14) nokogiri (1.6.0) mini_portile (~> 0.5.0) - orm_adapter (0.4.0) - paperclip (3.5.1) + orm_adapter (0.5.0) + paperclip (3.5.2) activemodel (>= 3.0.0) activesupport (>= 3.0.0) - cocaine (~> 0.5.0) + cocaine (~> 0.5.3) mime-types pg (0.16.0) polyglot (0.3.3) @@ -121,17 +119,17 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.14) - actionmailer (= 3.2.14) - actionpack (= 3.2.14) - activerecord (= 3.2.14) - activeresource (= 3.2.14) - activesupport (= 3.2.14) + 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.14) - railties (3.2.14) - actionpack (= 3.2.14) - activesupport (= 3.2.14) + 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) @@ -145,10 +143,10 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - rspec-core (2.14.5) - rspec-expectations (2.14.2) + rspec-core (2.14.7) + rspec-expectations (2.14.4) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.3) + rspec-mocks (2.14.4) rspec-rails (2.14.0) actionpack (>= 3.0) activesupport (>= 3.0) @@ -156,31 +154,35 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - sass (3.2.10) + sass (3.2.12) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - simplecov (0.7.1) - multi_json (~> 1.0) - simplecov-html (~> 0.7.1) - simplecov-html (0.7.1) + simplecov (0.8.2) + docile (~> 1.1.0) + multi_json + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + term-ansicolor (1.2.2) + tins (~> 0.8) thor (0.18.1) tilt (1.4.1) - treetop (1.4.14) + tins (0.13.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) turn (0.8.2) ansi (>= 1.2.2) - tzinfo (0.3.37) - uglifier (2.1.2) + tzinfo (0.3.38) + uglifier (2.3.2) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + json (>= 1.8.0) warden (1.2.3) rack (>= 1.0) xml-simple (1.1.2) @@ -211,7 +213,7 @@ DEPENDENCIES paperclip (~> 3.5.1) pg (~> 0.16.0) psych (~> 1.3.4) - rails (~> 3.2.13) + rails (~> 3.2.16) rspec (~> 2.14.1) rspec-rails (~> 2.14.0) sass (~> 3.2.10)