From: David Yip <yipdw@member.fsf.org>
Date: Sat, 30 Dec 2017 23:20:07 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/master' into merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4cca1d1e7efce51eecb64489f412a7b8631f0aed;p=mastodon.git

Merge remote-tracking branch 'origin/master' into merge-upstream

 Conflicts:
	app/controllers/auth/confirmations_controller.rb
---

4cca1d1e7efce51eecb64489f412a7b8631f0aed
diff --cc app/controllers/auth/confirmations_controller.rb
index 5ffa1c9a3,2fdb281f4..72b8e9dd8
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@@ -2,17 -2,4 +2,12 @@@
  
  class Auth::ConfirmationsController < Devise::ConfirmationsController
    layout 'auth'
++
 +  before_action :set_pack
 +
-   def show
-     super do |user|
-       BootstrapTimelineWorker.perform_async(user.account_id) if user.errors.empty?
-     end
-   end
-   
 +  private
 +
 +  def set_pack
 +    use_pack 'auth'
 +  end
  end