Browse files

Merge branch 'master' of https://github.com/zerobearing2/heroku-rails

…into zerobearing2-master
  • Loading branch information...
2 parents aae8d8a + 5be84cf commit 6d9009673aa091ef8363565d5c7d8d4a7f0c4758 @jacquescrocker jacquescrocker committed Apr 16, 2011
Showing with 3 additions and 3 deletions.
  1. +2 −2 .bundle/config
  2. +1 −1 lib/heroku-rails/railtie.rb
View
4 .bundle/config
@@ -1,2 +1,2 @@
----
-BUNDLE_DISABLE_SHARED_GEMS: "1"
+--- {}
+
View
2 lib/heroku-rails/railtie.rb
@@ -2,7 +2,7 @@ module Heroku
module Rails
class Railtie < ::Rails::Railtie
rake_tasks do
- HerokuRails::Config.root = Rails.root
+ HerokuRails::Config.root = ::Rails.root
load 'heroku/rails/tasks.rb'
end
end

0 comments on commit 6d90096

Please sign in to comment.