Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
6da97336
Commit
6da97336
authored
Oct 18, 2018
by
JB Vasseur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ApplicationsFinder !22296
parent
deeeffe0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
6 deletions
+2
-6
app/controllers/admin/applications_controller.rb
app/controllers/admin/applications_controller.rb
+2
-6
No files found.
app/controllers/admin/applications_controller.rb
View file @
6da97336
...
@@ -6,11 +6,9 @@ class Admin::ApplicationsController < Admin::ApplicationController
...
@@ -6,11 +6,9 @@ class Admin::ApplicationsController < Admin::ApplicationController
before_action
:set_application
,
only:
[
:show
,
:edit
,
:update
,
:destroy
]
before_action
:set_application
,
only:
[
:show
,
:edit
,
:update
,
:destroy
]
before_action
:load_scopes
,
only:
[
:new
,
:create
,
:edit
,
:update
]
before_action
:load_scopes
,
only:
[
:new
,
:create
,
:edit
,
:update
]
# rubocop: disable CodeReuse/ActiveRecord
def
index
def
index
@applications
=
Doorkeeper
::
Application
.
where
(
"owner_id IS NULL"
)
@applications
=
ApplicationsFinder
.
new
.
execute
end
end
# rubocop: enable CodeReuse/ActiveRecord
def
show
def
show
end
end
...
@@ -49,11 +47,9 @@ class Admin::ApplicationsController < Admin::ApplicationController
...
@@ -49,11 +47,9 @@ class Admin::ApplicationsController < Admin::ApplicationController
private
private
# rubocop: disable CodeReuse/ActiveRecord
def
set_application
def
set_application
@application
=
Doorkeeper
::
Application
.
where
(
"owner_id IS NULL"
).
find
(
params
[
:id
])
@application
=
ApplicationsFinder
.
new
({
id:
params
[
:id
]
}).
execute
end
end
# rubocop: enable CodeReuse/ActiveRecord
# Only allow a trusted parameter "white list" through.
# Only allow a trusted parameter "white list" through.
def
application_params
def
application_params
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment