Merge pull request #5306 from nonamethanks/new-roles

Users: add Contributor and Approver user levels

app/controllers/admin/users_controller.rb

@@ -10,10 +10,8 @@ module Admin
       @user = authorize User.find(params[:id]), :promote?
 
       @level = params.dig(:user, :level)
-      @can_upload_free = params.dig(:user, :can_upload_free)
-      @can_approve_posts = params.dig(:user, :can_approve_posts)
 
-      @user.promote_to!(@level, CurrentUser.user, can_upload_free: @can_upload_free, can_approve_posts: @can_approve_posts)
+      @user.promote_to!(@level, CurrentUser.user)
 
       redirect_to edit_admin_user_path(@user), :notice => "User updated"
     end