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
1038bc79
Commit
1038bc79
authored
Oct 02, 2020
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add feature categories to controllers beginning with J
parent
f69d8170
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
1 deletion
+5
-1
app/controllers/jira_connect/application_controller.rb
app/controllers/jira_connect/application_controller.rb
+2
-0
app/controllers/jwt_controller.rb
app/controllers/jwt_controller.rb
+2
-0
spec/controllers/every_controller_spec.rb
spec/controllers/every_controller_spec.rb
+1
-1
No files found.
app/controllers/jira_connect/application_controller.rb
View file @
1038bc79
...
@@ -7,6 +7,8 @@ class JiraConnect::ApplicationController < ApplicationController
...
@@ -7,6 +7,8 @@ class JiraConnect::ApplicationController < ApplicationController
skip_before_action
:verify_authenticity_token
skip_before_action
:verify_authenticity_token
before_action
:verify_atlassian_jwt!
before_action
:verify_atlassian_jwt!
feature_category
:integrations
attr_reader
:current_jira_installation
attr_reader
:current_jira_installation
private
private
...
...
app/controllers/jwt_controller.rb
View file @
1038bc79
...
@@ -8,6 +8,8 @@ class JwtController < ApplicationController
...
@@ -8,6 +8,8 @@ class JwtController < ApplicationController
# Add this before other actions, since we want to have the user or project
# Add this before other actions, since we want to have the user or project
prepend_before_action
:auth_user
,
:authenticate_project_or_user
prepend_before_action
:auth_user
,
:authenticate_project_or_user
feature_category
:authentication_and_authorization
SERVICES
=
{
SERVICES
=
{
Auth
::
ContainerRegistryAuthenticationService
::
AUDIENCE
=>
Auth
::
ContainerRegistryAuthenticationService
Auth
::
ContainerRegistryAuthenticationService
::
AUDIENCE
=>
Auth
::
ContainerRegistryAuthenticationService
}.
freeze
}.
freeze
...
...
spec/controllers/every_controller_spec.rb
View file @
1038bc79
...
@@ -26,7 +26,7 @@ RSpec.describe "Every controller" do
...
@@ -26,7 +26,7 @@ RSpec.describe "Every controller" do
next
if
controller
.
feature_category_for_action
(
action
)
next
if
controller
.
feature_category_for_action
(
action
)
next
unless
controller
.
to_s
.
start_with?
(
'B'
,
'C'
,
'D'
,
'E'
,
'F'
,
next
unless
controller
.
to_s
.
start_with?
(
'B'
,
'C'
,
'D'
,
'E'
,
'F'
,
'H'
,
'I'
,
'H'
,
'I'
,
'J'
,
'Projects::MergeRequestsController'
)
'Projects::MergeRequestsController'
)
"
#{
controller
}
#
#{
action
}
"
"
#{
controller
}
#
#{
action
}
"
...
...
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