Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
12acf5e9ff
@ -11,10 +11,10 @@ module Admin
|
|||||||
|
|
||||||
skip_before_filter :validate_site_membership
|
skip_before_filter :validate_site_membership
|
||||||
|
|
||||||
before_filter :is_step_already_done?
|
|
||||||
|
|
||||||
before_filter :allow_installation?
|
before_filter :allow_installation?
|
||||||
|
|
||||||
|
before_filter :is_step_already_done?
|
||||||
|
|
||||||
skip_load_and_authorize_resource
|
skip_load_and_authorize_resource
|
||||||
|
|
||||||
def show
|
def show
|
||||||
|
Loading…
Reference in New Issue
Block a user