Merge branch 'master' into glitch-soc/merge-upstream

2018-07-26 21:22:43 +02:00
parent 82ab5aacb2 3c35b34b61
commit 6141c2a035
72 changed files with 741 additions and 85 deletions
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -9,6 +9,7 @@ Warden::Manager.after_set_user except: :fetch do |user, warden|
    value: session_id,
    expires: 1.year.from_now,
    httponly: true,
+    secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
  }
 end

@@ -18,6 +19,7 @@ Warden::Manager.after_fetch do |user, warden|
      value: warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'],
      expires: 1.year.from_now,
      httponly: true,
+      secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
    }
  else
    warden.logout