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

Conflicts: app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
parent e4944d065b f4b80e6511
commit 4cca1d1e7e
23 changed files with 190 additions and 27 deletions
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@ -2,14 +2,9 @@

 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