Merge pull request #91 from rumblex/disable-force-ssl

disable force ssl

Author: cveneziani

config/environments/production.rb

@@ -41,12 +41,13 @@
 
   # Action Cable endpoint configuration
   config.action_cable.url = "wss://#{ENV["HOST"]}/cable"
-  config.action_cable.allowed_request_origins = [ENV["HOST"], "battle-type.com", "www.battle-type.com"].map do |e|
-                                                  ["https://#{e}", /https:\/\/#{e}.*/]
+  config.action_cable.allowed_request_origins = [ENV["HOST"], "battle-type.com", "www.battle-type.com", "battletype.2016.rubyrampage.com"].map do |e|
+                                                  ["https://#{e}", /https:\/\/#{e}.*/,
+                                                   "http://#{e}", /http:\/\/#{e}.*/]
                                                 end.flatten
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  config.force_ssl = true
+  # config.force_ssl = true
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.