Permalink
Browse files

added pg gem for heroku deploy

  • Loading branch information...
1 parent 5c05075 commit 8be67f1a793402ffd4d973cbd7b3076c7e55c9ce @TildeWill committed Apr 16, 2012
Showing with 3 additions and 5 deletions.
  1. +1 −1 Gemfile
  2. +2 −2 Gemfile.lock
  3. +0 −2 app/controllers/application_controller.rb
View
2 Gemfile
@@ -5,8 +5,8 @@ gem 'coffee-script'
gem 'httmultiparty', '~> 0.2'
gem 'haml', '~> 3.1'
gem 'json', '>= 1.5'
+gem 'pg'
gem 'rails', '~> 3.1'
-gem "rinku", "~> 1.5"
gem 'sass', '~> 3.1'
gem 'uglifier'
View
4 Gemfile.lock
@@ -68,6 +68,7 @@ GEM
multi_xml (0.4.2)
multipart-post (1.1.5)
mysql (2.8.1)
+ pg (0.13.2)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.1)
@@ -96,7 +97,6 @@ GEM
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
- rinku (1.5.1)
rspec (2.7.0)
rspec-core (~> 2.7.0)
rspec-expectations (~> 2.7.0)
@@ -141,8 +141,8 @@ DEPENDENCIES
httmultiparty (~> 0.2)
json (>= 1.5)
mysql (~> 2.8.1)
+ pg
rails (~> 3.1)
- rinku (~> 1.5)
rspec (~> 2.7.0)
rspec-rails (~> 2.7.0)
sass (~> 3.1)
View
2 app/controllers/application_controller.rb
@@ -1,5 +1,3 @@
-#require 'rinku'
-
class ApplicationController < ActionController::Base
protect_from_forgery
end

0 comments on commit 8be67f1

Please sign in to comment.