Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
This commit is contained in:
commit
f7c4d4464b
10 changed files with 73 additions and 22 deletions
|
@ -31,7 +31,7 @@ class ApplicationController < ActionController::Base
|
|||
private
|
||||
|
||||
def https_enabled?
|
||||
Rails.env.production? && ENV['LOCAL_HTTPS'] == 'true'
|
||||
Rails.env.production?
|
||||
end
|
||||
|
||||
def store_current_location
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue