From bacb14f03234e01678ff7545857522f684358f1b Mon Sep 17 00:00:00 2001 From: Sebastian von Conrad Date: Mon, 1 Apr 2013 17:27:17 +1100 Subject: [PATCH] Bundle update --- Gemfile | 2 +- Gemfile.lock | 156 ++++++++++++++++++++++++++------------------------- 2 files changed, 80 insertions(+), 78 deletions(-) diff --git a/Gemfile b/Gemfile index 3389e2e..8c748ee 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Rails -gem 'rails', '3.2.8' +gem 'rails' gem 'unicorn' # Models diff --git a/Gemfile.lock b/Gemfile.lock index 56b39cf..f245597 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,120 +1,121 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.8) - actionpack (= 3.2.8) - mail (~> 2.4.4) - actionpack (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + actionmailer (3.2.13) + actionpack (= 3.2.13) + mail (~> 2.5.3) + actionpack (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) - rack (~> 1.4.0) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.3) - activemodel (3.2.8) - activesupport (= 3.2.8) + sprockets (~> 2.2.1) + activemodel (3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) - activerecord (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + activerecord (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) - activesupport (3.2.8) - i18n (~> 0.6) + activeresource (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + activesupport (3.2.13) + i18n (= 0.6.1) multi_json (~> 1.0) arel (3.0.2) - builder (3.0.0) + builder (3.0.4) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.3.3) - database_cleaner (0.8.0) + coffee-script-source (1.6.2) + database_cleaner (0.9.1) diff-lcs (1.1.3) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) forgery (0.5.0) - fuubar (1.0.0) + fuubar (1.1.0) rspec (~> 2.0) rspec-instafail (~> 0.2.0) - ruby-progressbar (~> 0.0.10) - haml (3.1.7) - haml-rails (0.3.4) - actionpack (~> 3.0) - activesupport (~> 3.0) - haml (~> 3.0) - railties (~> 3.0) + ruby-progressbar (~> 1.0.0) + haml (4.0.1) + tilt + haml-rails (0.4) + actionpack (>= 3.1, < 4.1) + activesupport (>= 3.1, < 4.1) + haml (>= 3.1, < 4.1) + railties (>= 3.1, < 4.1) has_scope (0.5.1) hike (1.2.1) - hodel_3000_compliant_logger (0.1.0) - httparty (0.8.3) + hodel_3000_compliant_logger (0.1.1) + httparty (0.10.2) multi_json (~> 1.0) - multi_xml - i18n (0.6.0) + multi_xml (>= 0.5.2) + i18n (0.6.1) in_bed_with (0.1.0) activesupport (~> 3.1) - inherited_resources (1.3.1) + inherited_resources (1.4.0) has_scope (~> 0.5.0) - responders (~> 0.6) + responders (~> 0.9) journey (1.0.4) - jquery-rails (2.1.1) - railties (>= 3.1.0, < 5.0) - thor (~> 0.14) - json (1.7.5) - kgio (2.7.4) + jquery-rails (2.2.1) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.7.7) + kgio (2.8.0) machinist (2.0) - mail (2.4.4) + mail (2.5.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.19) - multi_json (1.3.6) - multi_xml (0.5.1) - newrelic_rpm (3.4.1) - nokogiri (1.5.5) - oink (0.9.3) + mime-types (1.22) + multi_json (1.7.2) + multi_xml (0.5.3) + newrelic_rpm (3.6.0.78) + nokogiri (1.5.9) + oink (0.10.1) activerecord hodel_3000_compliant_logger - pg (0.14.0) + pg (0.15.0) polyamorous (0.5.0) activerecord (~> 3.0) polyglot (0.3.3) - rack (1.4.1) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) - rails (3.2.8) - actionmailer (= 3.2.8) - actionpack (= 3.2.8) - activerecord (= 3.2.8) - activeresource (= 3.2.8) - activesupport (= 3.2.8) + rails (3.2.13) + actionmailer (= 3.2.13) + actionpack (= 3.2.13) + activerecord (= 3.2.13) + activeresource (= 3.2.13) + activesupport (= 3.2.13) bundler (~> 1.0) - railties (= 3.2.8) - railties (3.2.8) - actionpack (= 3.2.8) - activesupport (= 3.2.8) + railties (= 3.2.13) + railties (3.2.13) + actionpack (= 3.2.13) + activesupport (= 3.2.13) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.10.0) - rake (0.9.2.2) - rdoc (3.12) + rake (10.0.4) + rdoc (3.12.2) json (~> 1.4) - responders (0.9.2) + responders (0.9.3) railties (~> 3.1) rspec (2.8.0) rspec-core (~> 2.8.0) @@ -130,30 +131,31 @@ GEM activesupport (>= 3.0) railties (>= 3.0) rspec (~> 2.8.0) - ruby-progressbar (0.0.10) - sass (3.2.1) - sass-rails (3.2.5) + ruby-progressbar (1.0.2) + sass (3.2.7) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sprockets (2.1.3) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - squeel (1.0.9) + squeel (1.0.18) activerecord (~> 3.0) activesupport (~> 3.0) polyamorous (~> 0.5.0) - thor (0.16.0) - tilt (1.3.3) - treetop (1.4.10) + thor (0.18.1) + tilt (1.3.6) + treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) - uglifier (1.2.7) + tzinfo (0.3.37) + uglifier (1.3.0) execjs (>= 0.3.0) - multi_json (~> 1.3) - unicorn (4.3.1) + multi_json (~> 1.0, >= 1.0.2) + unicorn (4.6.2) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -179,7 +181,7 @@ DEPENDENCIES nokogiri oink pg - rails (= 3.2.8) + rails rspec-rails (~> 2.8.0) sass-rails (~> 3.2.3) squeel