0
0
Fork 0

Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master

This commit is contained in:
David Yip 2018-01-07 13:30:52 -06:00
commit f7c4d4464b
No known key found for this signature in database
GPG key ID: 7DA0036508FCC0CC
10 changed files with 73 additions and 22 deletions

View file

@ -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