Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 08:19:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Yip
2018-01-07 13:30:52 -06:00
parent 70c99a9f34 c2e1bfd9ae
commit f7c4d4464b
10 changed files with 73 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
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