Merge remote-tracking branch 'origin/master'

2012-03-05 11:13:44 +08:00 · 2012-03-05 11:13:44 +08:00 · 12acf5e9ff
commit 12acf5e9ff
parent fa42eb4f74 724954071a
1 changed files with 2 additions and 2 deletions
--- a/app/controllers/admin/installation_controller.rb
+++ b/app/controllers/admin/installation_controller.rb
@ -11,10 +11,10 @@ module Admin

    skip_before_filter :validate_site_membership

-    before_filter :is_step_already_done?
-
    before_filter :allow_installation?

+    before_filter :is_step_already_done?
+
    skip_load_and_authorize_resource

    def show