Merge remote-tracking branch 'origin/merged-rails-3-2-assset-pipeline' into rails-3-develop

Conflicts:
    Gemfile.lock

3 files changed, 10 insertions, 1 deletions

diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb
index da0fc8e96..cbff03acb 100755
--- a/script/handle-mail-replies.rb
+++ b/script/handle-mail-replies.rb
@@ -20,6 +20,9 @@ $:.push(File.join($alaveteli_dir, "lib", "mail_handler"))
 load 'configuration.rb'
 MySociety::Config.set_file(File.join($alaveteli_dir, 'config', 'general'), true)
 MySociety::Config.load_default
+
+
+require 'active_support/all'
 require 'mail_handler'
 if RUBY_VERSION.to_f >= 1.9
     # the default encoding for IO is utf-8, and we use utf-8 internally
diff --git a/script/rails-post-deploy b/script/rails-post-deploy
index c09868347..bd5165a72 100755
--- a/script/rails-post-deploy
+++ b/script/rails-post-deploy
@@ -96,3 +96,5 @@ bundle exec rake submodules:check
 bundle exec rake db:migrate #--trace
 
 bundle exec rake themes:install
+
+bundle exec rake assets:precompile
diff --git a/script/switch-theme.rb b/script/switch-theme.rb
index 47f81c7a8..03d59a2f9 100755
--- a/script/switch-theme.rb
+++ b/script/switch-theme.rb
@@ -117,4 +117,8 @@ symlink(full_theme_path,
         requested_theme)
 
 STDERR.puts """Switched to #{requested_theme}!
-You will need to restart any development server you have running."""
+You will need to:
+  1. restart any development server you have running.
+  2. run: bundle exec rake assets:clean
+  3. run: bundle exec rake assets:precompile
+"""