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
5fca26fa
Commit
5fca26fa
authored
Mar 18, 2019
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update code based on feedback
parent
e58a5e24
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
ee/app/controllers/groups/saml_providers_controller.rb
ee/app/controllers/groups/saml_providers_controller.rb
+1
-1
ee/db/migrate/20190301095211_create_scim_oauth_access_tokens.rb
...migrate/20190301095211_create_scim_oauth_access_tokens.rb
+2
-0
ee/spec/controllers/groups/scim_oauth_controller_spec.rb
ee/spec/controllers/groups/scim_oauth_controller_spec.rb
+3
-3
No files found.
ee/app/controllers/groups/saml_providers_controller.rb
View file @
5fca26fa
# frozen_string_literal: true
require_relative
'../concerns/saml_authorization.rb'
# frozen_string_literal: true
require_relative
'../concerns/saml_authorization.rb'
class
Groups::SamlProvidersController
<
Groups
::
ApplicationController
include
SamlAuthorization
...
...
db/migrate/20190301095211_create_scim_oauth_access_tokens.rb
→
ee/
db/migrate/20190301095211_create_scim_oauth_access_tokens.rb
View file @
5fca26fa
class
CreateScimOauthAccessTokens
<
ActiveRecord
::
Migration
[
5.0
]
DOWNTIME
=
false
def
change
create_table
:scim_oauth_access_tokens
do
|
t
|
t
.
timestamps_with_timezone
null:
false
...
...
ee/spec/controllers/groups/scim_oauth_controller_spec.rb
View file @
5fca26fa
...
...
@@ -39,15 +39,15 @@ describe Groups::ScimOauthController do
context
'with token'
do
let!
(
:scim_token
)
{
create
(
:scim_oauth_access_token
,
group:
group
)
}
before
do
it
'shows the token'
do
subject
end
it
'shows the token'
do
expect
(
json_response
[
'scim_token'
]).
to
eq
(
scim_token
.
token
)
end
it
'shows the url'
do
subject
expect
(
json_response
[
'scim_api_url'
]).
not_to
be_empty
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