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

2019-01-26 18:32:49 +01:00
parent 270bf7778d 9519d55332
commit 80d954ec10
2 changed files with 3 additions and 0 deletions
--- a/app/models/concerns/omniauthable.rb
+++ b/app/models/concerns/omniauthable.rb
@@ -63,6 +63,7 @@ module Omniauthable
      {
        email: email || "#{TEMP_EMAIL_PREFIX}-#{auth.uid}-#{auth.provider}.com",
        password: Devise.friendly_token[0, 20],
+        agreement: true,
        account_attributes: {
          username: ensure_unique_username(auth.uid),
          display_name: display_name,