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
c49b3f5f
Commit
c49b3f5f
authored
Jun 28, 2017
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust wrong conflict resolutions
parent
381b4219
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
lib/api/namespaces.rb
lib/api/namespaces.rb
+0
-2
spec/requests/api/namespaces_spec.rb
spec/requests/api/namespaces_spec.rb
+4
-2
No files found.
lib/api/namespaces.rb
View file @
c49b3f5f
...
...
@@ -39,8 +39,6 @@ module API
else
render_validation_error!
(
namespace
)
end
present
paginate
(
namespaces
),
with:
Entities
::
Namespace
,
current_user:
current_user
end
end
end
...
...
spec/requests/api/namespaces_spec.rb
View file @
c49b3f5f
...
...
@@ -24,9 +24,11 @@ describe API::Namespaces do
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
include_pagination_headers
expect
(
group_kind_json_response
.
keys
).
to
contain_exactly
(
'id'
,
'kind'
,
'name'
,
'path'
,
'full_path'
,
'parent_id'
,
'members_count_with_descendants'
)
'parent_id'
,
'members_count_with_descendants'
,
'plan'
,
'shared_runners_minutes_limit'
)
expect
(
user_kind_json_response
.
keys
).
to
contain_exactly
(
'id'
,
'kind'
,
'name'
,
'path'
,
'full_path'
,
'parent_id'
)
expect
(
user_kind_json_response
.
keys
).
to
contain_exactly
(
'id'
,
'kind'
,
'name'
,
'path'
,
'full_path'
,
'parent_id'
,
'plan'
,
'shared_runners_minutes_limit'
)
end
it
"admin: returns an array of all namespaces"
do
...
...
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