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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d5886465
Commit
d5886465
authored
Sep 22, 2017
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix specs
parent
f5a69b09
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
app/controllers/concerns/oauth_applications.rb
app/controllers/concerns/oauth_applications.rb
+1
-1
ee/app/controllers/ee/concerns/oauth_applications.rb
ee/app/controllers/ee/concerns/oauth_applications.rb
+11
-9
No files found.
app/controllers/concerns/oauth_applications.rb
View file @
d5886465
module
OauthApplications
module
OauthApplications
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
prepend
::
EE
::
OauthApplications
prepend
::
EE
::
Concerns
::
OauthApplications
included
do
included
do
before_action
:prepare_scopes
,
only:
[
:create
,
:update
]
before_action
:prepare_scopes
,
only:
[
:create
,
:update
]
...
...
ee/app/controllers/ee/concerns/oauth_applications.rb
View file @
d5886465
module
EE
module
EE
module
Concerns
module
OauthApplications
module
OauthApplications
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
def
log_audit_event
def
log_audit_event
AuditEventService
.
new
(
current_user
,
::
AuditEventService
.
new
(
current_user
,
current_user
,
current_user
,
action: :custom
,
action: :custom
,
custom_message:
'OAuth access granted'
,
custom_message:
'OAuth access granted'
,
...
@@ -11,4 +12,5 @@ module EE
...
@@ -11,4 +12,5 @@ module EE
.
for_user
(
@application
.
name
).
security_event
.
for_user
(
@application
.
name
).
security_event
end
end
end
end
end
end
end
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