Upgrade Rails to 3.2.6. Refs #91

2 files changed, 8 insertions, 3 deletions

diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 251348b9e..1147b52da 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -1,6 +1,6 @@
 namespace :assets do
   task :environment do
-    puts "Sprockets::Bootstrap workaround (#{__FILE__})"
-    Sprockets::Bootstrap.new(Rails.application).run if Rails.application.assets.paths.empty?
+    # puts "Sprockets::Bootstrap workaround (#{__FILE__})"
+    # Sprockets::Bootstrap.new(Rails.application).run if Rails.application.assets.paths.empty?
   end
 end
diff --git a/lib/tasks/warbler.rake b/lib/tasks/warbler.rake
index 11aa26155..e69457583 100644
--- a/lib/tasks/warbler.rake
+++ b/lib/tasks/warbler.rake
@@ -1,7 +1,12 @@
 begin
   require 'warbler'
   Warbler::Task.new
-  task :war => "assets:precompile"
+
+  task "war:setup" do
+    ENV['RAILS_RELATIVE_URL_ROOT'] ||= "/chouette2"
+  end
+
+  task :war => ["war:setup", "assets:precompile"]
 rescue LoadError => e
   puts "Failed to load Warbler. Make sure it's installed."
 end