Skip to content

Commit

Permalink
Attempting to update to Ruby 2.0 and Rails 4.0. Currently a fail
Browse files Browse the repository at this point in the history
  • Loading branch information
David Fisher committed Mar 22, 2013
1 parent 25a2df0 commit fda7962
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 34 deletions.
3 changes: 2 additions & 1 deletion Gemfile
@@ -1,6 +1,7 @@
source 'https://rubygems.org'
ruby '2.0.0'

gem 'rails', '3.2.12'
gem 'rails', '3.2.13'
gem 'unicorn'
gem 'sqlite3', groups: [:development, :test]
gem 'pg', groups: [:production]
Expand Down
64 changes: 32 additions & 32 deletions Gemfile.lock
Expand Up @@ -14,32 +14,32 @@ GEM
Platform (>= 0.4.0)
open4
Platform (0.4.0)
actionmailer (3.2.12)
actionpack (= 3.2.12)
mail (~> 2.4.4)
actionpack (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
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.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.12)
activesupport (= 3.2.12)
activemodel (3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
activerecord (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
activesupport (3.2.12)
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.4)
Expand Down Expand Up @@ -78,12 +78,12 @@ GEM
actionpack (>= 3.1)
less (~> 2.2.0)
libv8 (3.11.8.4)
mail (2.4.4)
mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.21)
multi_json (1.6.0)
multi_json (1.7.1)
newrelic_rpm (3.5.3.25)
open4 (1.3.0)
pg (0.14.1)
Expand All @@ -95,24 +95,24 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.12)
actionmailer (= 3.2.12)
actionpack (= 3.2.12)
activerecord (= 3.2.12)
activeresource (= 3.2.12)
activesupport (= 3.2.12)
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.12)
railties (3.2.12)
actionpack (= 3.2.12)
activesupport (= 3.2.12)
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 (10.0.3)
rdoc (3.12.1)
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.2)
sass (3.2.3)
Expand All @@ -129,11 +129,11 @@ GEM
therubyracer (0.11.0)
ref
thor (0.17.0)
tilt (1.3.3)
tilt (1.3.6)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.35)
tzinfo (0.3.37)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand All @@ -159,7 +159,7 @@ DEPENDENCIES
libv8 (~> 3.11.8)
newrelic_rpm
pg
rails (= 3.2.12)
rails (= 3.2.13)
sass-rails (~> 3.2.3)
sqlite3
therubyracer
Expand Down
4 changes: 3 additions & 1 deletion app/controllers/whores_controller.rb
Expand Up @@ -4,7 +4,9 @@ class WhoresController < ApplicationController
def index
@whore = Whore.new
@whores = Whore.order("id DESC").page params[:page]
@whore_count = Whore.count
@whore_count = Rails.cache.fetch([:whore_count], expires_in: 30.minutes) do
Whore.count
end
end

def create
Expand Down

0 comments on commit fda7962

Please sign in to comment.