mod actions: separate account upgrades from promotions (fix #3841)

app/controllers/admin/users_controller.rb

@@ -8,8 +8,7 @@ module Admin
 
     def update
       @user = User.find(params[:id])
-      promotion = UserPromotion.new(@user, CurrentUser.user, params[:user][:level], params[:user])
-      promotion.promote!
+      @user.promote_to!(params[:user][:level], params[:user])
       redirect_to edit_admin_user_path(@user), :notice => "User updated"
     end
   end

app/controllers/user_upgrades_controller.rb

@@ -48,7 +48,7 @@ class UserUpgradesController < ApplicationController
         :card => params[:stripeToken],
         :description => params[:desc]
       )
-      @user.promote_to!(level, :skip_feedback => true)
+      @user.promote_to!(level, is_upgrade: true)
       flash[:success] = true
     rescue Stripe::CardError => e
       flash[:error] = e.message