Commit 8fa83aed authored by Phil Hughes's avatar Phil Hughes

Merge branch '10265-load-100-licenses-per-default' into 'master'

Load 100 licenses per default

Closes #10265

See merge request gitlab-org/gitlab-ee!9913
parents bdcb038e 608bcd44
...@@ -52,7 +52,7 @@ export const loadManagedLicenses = ({ dispatch, state }) => { ...@@ -52,7 +52,7 @@ export const loadManagedLicenses = ({ dispatch, state }) => {
const { apiUrlManageLicenses } = state; const { apiUrlManageLicenses } = state;
return axios return axios
.get(apiUrlManageLicenses) .get(apiUrlManageLicenses, { params: { per_page: 100 } })
.then(({ data }) => { .then(({ data }) => {
dispatch('receiveLoadManagedLicenses', data); dispatch('receiveLoadManagedLicenses', data);
}) })
......
---
title: 'License Management: Load up to a 100 licenses per default'
merge_request: 9913
author:
type: other
...@@ -444,7 +444,7 @@ describe('License store actions', () => { ...@@ -444,7 +444,7 @@ describe('License store actions', () => {
let endpointMock; let endpointMock;
beforeEach(() => { beforeEach(() => {
endpointMock = axiosMock.onGet(apiUrlManageLicenses); endpointMock = axiosMock.onGet(apiUrlManageLicenses, { params: { per_page: 100 } });
}); });
it('dispatches requestLoadManagedLicenses and receiveLoadManagedLicenses for successful response', done => { it('dispatches requestLoadManagedLicenses and receiveLoadManagedLicenses for successful response', done => {
......
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