adding Grit back in (#$#%@#$%#)

mlc · Jan 3, 2012 · 7441a5d · 7441a5d
1 parent 05029b4
commit 7441a5d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -14,7 +14,7 @@ gem 'whenever', '0.4.1', :require => false
 gem 'rsolr', '0.12.1'
 gem 'sunspot', '1.1.0'
 gem 'sunspot_rails', '1.1.0', :require => 'sunspot/rails'
-# gem 'grit'
+gem 'grit'
 gem 'aws-s3', :require => 'aws/s3'
 gem 'delayed_job', '< 2'
 gem 'fastercsv'

diff --git a/config/deploy.rb b/config/deploy.rb
@@ -1,13 +1,13 @@
 require 'erb'
 require 'json'
-# require 'grit'
+require 'grit'
 require 'capistrano/ext/multistage'
 require "bundler/capistrano"
 
-# def git_working_dir_branch
-#   repo = Grit::Repo.new(".")
-#   repo.head.name
-# end
+def git_working_dir_branch
+  repo = Grit::Repo.new(".")
+  repo.head.name
+end
 
 set :application, "pbcore"
 set :scm, :git