Commit c49b3f5f authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

Adjust wrong conflict resolutions

parent 381b4219
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment