app/controllers/locomotive/base_controller.rb in locomotive_cms-2.0.3 vs app/controllers/locomotive/base_controller.rb in locomotive_cms-2.1.0

@@ -3,13 +3,16 @@
 
     include Locomotive::Routing::SiteDispatcher
     include Locomotive::ActionController::LocaleHelpers
     include Locomotive::ActionController::SectionHelpers
     include Locomotive::ActionController::UrlHelpers
+    include Locomotive::ActionController::Ssl
 
     layout '/locomotive/layouts/application'
 
+    before_filter :require_ssl
+
     before_filter :require_account
 
     before_filter :require_site
 
     before_filter :validate_site_membership
@@ -32,11 +35,11 @@
 
     rescue_from CanCan::AccessDenied do |exception|
       ::Locomotive.log "[CanCan::AccessDenied] #{exception.inspect}"
 
       if request.xhr?
-        render :json => { :error => exception.message }
+        render json: { error: exception.message }
       else
         flash[:alert] = exception.message
 
         redirect_to pages_url
       end
@@ -56,6 +59,6 @@
     def require_account
       authenticate_locomotive_account!
     end
 
   end
-end
+end
\ No newline at end of file