From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 5 Sep 2019 09:36:41 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5088eb8388fbfcb210a518f918ae5332e6d3979e;p=mastodon.git

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

5088eb8388fbfcb210a518f918ae5332e6d3979e
diff --cc app/controllers/auth/confirmations_controller.rb
index 1d6e4ec19,898525269..4e89446c7
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@@ -4,16 -4,22 +4,27 @@@ class Auth::ConfirmationsController < D
    layout 'auth'
  
    before_action :set_body_classes
 +  before_action :set_pack
+   before_action :require_unconfirmed!
  
    skip_before_action :require_functional!
  
+   def new
+     super
+ 
+     resource.email = current_user.unconfirmed_email || current_user.email if user_signed_in?
+   end
+ 
    private
  
 +  def set_pack
 +    use_pack 'auth'
 +  end
 +
+   def require_unconfirmed!
+     redirect_to edit_user_registration_path if user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank?
+   end
+ 
    def set_body_classes
      @body_classes = 'lighter'
    end
diff --cc app/javascript/core/admin.js
index 3f6f187bc,42c747d2e..ffdabe674
--- a/app/javascript/core/admin.js
+++ b/app/javascript/core/admin.js
@@@ -1,6 -1,5 +1,7 @@@
 +//  This file will be loaded on admin pages, regardless of theme.
 +
  import { delegate } from 'rails-ujs';
+ import ready from '../mastodon/ready';
  
  const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';