tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins committed 2018-01-07 15:17:13 +00:00
2 parents 5083311d64 1d92b90be9
commit c2e1bfd9ae
10 files changed
+73 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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