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
7d7cd4ea
Commit
7d7cd4ea
authored
Oct 02, 2020
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add feature categories to controllers beginning with O
parent
bddf5186
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
1 deletion
+9
-1
app/controllers/oauth/jira/authorizations_controller.rb
app/controllers/oauth/jira/authorizations_controller.rb
+2
-0
app/controllers/omniauth_callbacks_controller.rb
app/controllers/omniauth_callbacks_controller.rb
+2
-0
ee/app/controllers/omniauth_kerberos_spnego_controller.rb
ee/app/controllers/omniauth_kerberos_spnego_controller.rb
+2
-0
ee/app/controllers/operations_controller.rb
ee/app/controllers/operations_controller.rb
+2
-0
spec/controllers/every_controller_spec.rb
spec/controllers/every_controller_spec.rb
+1
-1
No files found.
app/controllers/oauth/jira/authorizations_controller.rb
View file @
7d7cd4ea
...
@@ -8,6 +8,8 @@ class Oauth::Jira::AuthorizationsController < ApplicationController
...
@@ -8,6 +8,8 @@ class Oauth::Jira::AuthorizationsController < ApplicationController
skip_before_action
:authenticate_user!
skip_before_action
:authenticate_user!
skip_before_action
:verify_authenticity_token
skip_before_action
:verify_authenticity_token
feature_category
:integrations
# 1. Rewire Jira OAuth initial request to our stablished OAuth authorization URL.
# 1. Rewire Jira OAuth initial request to our stablished OAuth authorization URL.
def
new
def
new
session
[
:redirect_uri
]
=
params
[
'redirect_uri'
]
session
[
:redirect_uri
]
=
params
[
'redirect_uri'
]
...
...
app/controllers/omniauth_callbacks_controller.rb
View file @
7d7cd4ea
...
@@ -11,6 +11,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
...
@@ -11,6 +11,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
protect_from_forgery
except:
[
:kerberos
,
:saml
,
:cas3
,
:failure
],
with: :exception
,
prepend:
true
protect_from_forgery
except:
[
:kerberos
,
:saml
,
:cas3
,
:failure
],
with: :exception
,
prepend:
true
feature_category
:authentication_and_authorization
def
handle_omniauth
def
handle_omniauth
omniauth_flow
(
Gitlab
::
Auth
::
OAuth
)
omniauth_flow
(
Gitlab
::
Auth
::
OAuth
)
end
end
...
...
ee/app/controllers/omniauth_kerberos_spnego_controller.rb
View file @
7d7cd4ea
...
@@ -5,6 +5,8 @@ class OmniauthKerberosSpnegoController < ApplicationController
...
@@ -5,6 +5,8 @@ class OmniauthKerberosSpnegoController < ApplicationController
skip_before_action
:authenticate_user!
skip_before_action
:authenticate_user!
feature_category
:authentication_and_authorization
def
negotiate
def
negotiate
if
spnego_provided?
&&
(
krb_principal
=
spnego_credentials!
(
spnego_token
))
if
spnego_provided?
&&
(
krb_principal
=
spnego_credentials!
(
spnego_token
))
session
[
OmniAuth
::
Strategies
::
KerberosSpnego
::
SESSION_KEY
]
=
krb_principal
session
[
OmniAuth
::
Strategies
::
KerberosSpnego
::
SESSION_KEY
]
=
krb_principal
...
...
ee/app/controllers/operations_controller.rb
View file @
7d7cd4ea
...
@@ -5,6 +5,8 @@ class OperationsController < ApplicationController
...
@@ -5,6 +5,8 @@ class OperationsController < ApplicationController
respond_to
:json
,
only:
[
:list
]
respond_to
:json
,
only:
[
:list
]
feature_category
:release_orchestration
POLLING_INTERVAL
=
120_000
POLLING_INTERVAL
=
120_000
def
index
def
index
...
...
spec/controllers/every_controller_spec.rb
View file @
7d7cd4ea
...
@@ -27,7 +27,7 @@ RSpec.describe "Every controller" do
...
@@ -27,7 +27,7 @@ RSpec.describe "Every controller" do
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'
,
'J'
,
'K'
,
'L'
,
'H'
,
'I'
,
'J'
,
'K'
,
'L'
,
'M'
,
'N'
,
'M'
,
'N'
,
'O'
,
'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