diff options
| author | JB Vasseur <jvasseur@gmail.com> | 2018-10-18 09:43:35 +0900 |
|---|---|---|
| committer | JB Vasseur <jvasseur@gmail.com> | 2018-10-18 09:43:35 +0900 |
| commit | 6da97336522dfba8a02485f765be433ec4f4781a (patch) | |
| tree | 2bcf9aae77e14d91e3faacd502ddc26145e354d2 | |
| parent | deeeffe09dfd331bc6068cea23346a35ef46ff45 (diff) | |
| download | gitlab-ce-6da97336522dfba8a02485f765be433ec4f4781a.tar.gz | |
Use ApplicationsFinder !22296
| -rw-r--r-- | app/controllers/admin/applications_controller.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/admin/applications_controller.rb b/app/controllers/admin/applications_controller.rb index 00d2cc01192..2fcd38607be 100644 --- a/app/controllers/admin/applications_controller.rb +++ b/app/controllers/admin/applications_controller.rb @@ -6,11 +6,9 @@ class Admin::ApplicationsController < Admin::ApplicationController before_action :set_application, only: [:show, :edit, :update, :destroy] before_action :load_scopes, only: [:new, :create, :edit, :update] - # rubocop: disable CodeReuse/ActiveRecord def index - @applications = Doorkeeper::Application.where("owner_id IS NULL") + @applications = ApplicationsFinder.new.execute end - # rubocop: enable CodeReuse/ActiveRecord def show end @@ -49,11 +47,9 @@ class Admin::ApplicationsController < Admin::ApplicationController private - # rubocop: disable CodeReuse/ActiveRecord def set_application - @application = Doorkeeper::Application.where("owner_id IS NULL").find(params[:id]) + @application = ApplicationsFinder.new({ id: params[:id] }).execute end - # rubocop: enable CodeReuse/ActiveRecord # Only allow a trusted parameter "white list" through. def application_params |