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
47931f8c
Commit
47931f8c
authored
May 24, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Rubocop offenses for cops enabled in CE
parent
fb2577cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
lib/api/users.rb
lib/api/users.rb
+1
-1
spec/controllers/oauth/geo_auth_controller_spec.rb
spec/controllers/oauth/geo_auth_controller_spec.rb
+1
-1
No files found.
lib/api/users.rb
View file @
47931f8c
...
@@ -24,7 +24,7 @@ module API
...
@@ -24,7 +24,7 @@ module API
@users
=
@users
.
non_ldap
if
skip_ldap
@users
=
@users
.
non_ldap
if
skip_ldap
@users
=
@users
.
search
(
params
[
:search
])
if
params
[
:search
].
present?
@users
=
@users
.
search
(
params
[
:search
])
if
params
[
:search
].
present?
@users
=
paginate
@users
@users
=
paginate
@users
end
end
if
current_user
.
is_admin?
if
current_user
.
is_admin?
present
@users
,
with:
Entities
::
UserFull
present
@users
,
with:
Entities
::
UserFull
...
...
spec/controllers/oauth/geo_auth_controller_spec.rb
View file @
47931f8c
...
@@ -106,7 +106,7 @@ describe Oauth::GeoAuthController do
...
@@ -106,7 +106,7 @@ describe Oauth::GeoAuthController do
allow_any_instance_of
(
Oauth2
::
LogoutTokenValidationService
).
to
receive
(
:execute
)
{
{
status: :error
,
message: :expired
}
}
allow_any_instance_of
(
Oauth2
::
LogoutTokenValidationService
).
to
receive
(
:execute
)
{
{
status: :error
,
message: :expired
}
}
get
:logout
,
state:
logout_state
get
:logout
,
state:
logout_state
expect
(
response
.
body
).
to
include
(
"There is a problem with the OAuth access_token:
#{
:expired
}
"
)
expect
(
response
.
body
).
to
include
(
"There is a problem with the OAuth access_token:
expired
"
)
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