Remove module TravelSupportProgram::ForceSSL

tsdgeos · Jan 10, 2014 · e1c38bd · e1c38bd
1 parent e87ff3f
commit e1c38bd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,7 +1,6 @@
 class ApplicationController < ActionController::Base
-  extend TravelSupportProgram::ForceSsl
 
-  force_ssl_if_available
+  force_ssl :unless => Proc.new { Rails.env.test? || Rails.env.development? }
   before_filter :authenticate_and_audit_user, :unless => :devise_controller?
   load_and_authorize_resource :unless => :devise_controller?
   before_filter :configure_permitted_parameters, if: :devise_controller?

diff --git a/app/controllers/user_profiles_controller.rb b/app/controllers/user_profiles_controller.rb
@@ -1,5 +1,5 @@
 class UserProfilesController < ApplicationController
-  force_ssl_if_available
+  force_ssl :unless => Proc.new { Rails.env.test? || Rails.env.development? }
   before_filter :set_user_and_profile
   before_filter :remove_role_from_params, :only => [:update, :update_password]
 

diff --git a/lib/travel_support_program/force_ssl.rb b/lib/travel_support_program/force_ssl.rb