Merge pull request #99 from kenips/bug/merge_conflict

Fix "undefined method 'perform' for main:Object" caused by merging #85.
rharriso · Jul 23, 2014 · d7fd042 · d7fd042
2 parents 90a5a6a + e57739c
commit d7fd042
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/tasks/bower.rake b/lib/tasks/bower.rake
@@ -24,13 +24,13 @@ namespace :bower do
     desc "Install both dependencies and devDependencies from bower"
     task :development, :options do |_, args|
       args.with_defaults(:options => '')
-      perform{ |bower| sh "#{bower} install #{args[:options]}" }
+      BowerRails::Performer.perform{ |bower| sh "#{bower} install #{args[:options]}" }
     end
 
     desc "Install only dependencies, excluding devDependencies from bower"
     task :production, :options do |_, args|
       args.with_defaults(:options => '')
-      perform{ |bower| sh "#{bower} install -p #{args[:options]}" }
+      BowerRails::Performer.perform{ |bower| sh "#{bower} install -p #{args[:options]}" }
     end
   end
 
@@ -78,4 +78,4 @@ before 'assets:precompile' do
   BowerRails.tasks.map do |task|
     Rake::Task[task].invoke
   end
-end
+end