renable assets

isotope11 · Feb 18, 2015 · 29b61e1 · 29b61e1
1 parent 489a55a
commit 29b61e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Capfile b/Capfile
@@ -1,7 +1,7 @@
 load 'deploy' if respond_to?(:namespace) # cap2 differentiator
 
 # Uncomment if you are using Rails' asset pipeline
-# load 'deploy/assets'
+load 'deploy/assets'
 
 Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
 

diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem 'pg'
 gem 'awesome_nested_set'
 
 gem 'capistrano', '2.15.4'
-gem 'rvm-capistrano', git: 'https://github.com/wayneeseguin/rvm-capistrano.git'
+gem 'rvm-capistrano', git: 'https://github.com/wayneeseguin/rvm-capistrano.git', require: false
 gem 'i18n', '~> 0.6.1'
 
 # Use bootstrap and formtastic all nicely: