From 24d67ec55454fc6f4e8e80bf7c8dc5bc677e8514 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 1 Jul 2022 18:08:33 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/oauth/applications_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/controllers/oauth') diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb index f425e996c2b..a996bad3fac 100644 --- a/app/controllers/oauth/applications_controller.rb +++ b/app/controllers/oauth/applications_controller.rb @@ -53,7 +53,9 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController def set_index_vars @applications = current_user.oauth_applications.load - @authorized_tokens = current_user.oauth_authorized_tokens.preload(:application).order(created_at: :desc).load # rubocop: disable CodeReuse/ActiveRecord + @authorized_tokens = current_user.oauth_authorized_tokens + .latest_per_application + .preload_application # Don't overwrite a value possibly set by `create` @application ||= Doorkeeper::Application.new -- cgit v1.2.1