Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
d3b18eede6
commit
a90fbe8387
|
@ -81,7 +81,6 @@ const Api = {
|
||||||
usageDataIncrementUniqueUsersPath: '/api/:version/usage_data/increment_unique_users',
|
usageDataIncrementUniqueUsersPath: '/api/:version/usage_data/increment_unique_users',
|
||||||
featureFlagUserLists: '/api/:version/projects/:id/feature_flags_user_lists',
|
featureFlagUserLists: '/api/:version/projects/:id/feature_flags_user_lists',
|
||||||
featureFlagUserList: '/api/:version/projects/:id/feature_flags_user_lists/:list_iid',
|
featureFlagUserList: '/api/:version/projects/:id/feature_flags_user_lists/:list_iid',
|
||||||
billableGroupMembersPath: '/api/:version/groups/:id/billable_members',
|
|
||||||
containerRegistryDetailsPath: '/api/:version/registry/repositories/:id/',
|
containerRegistryDetailsPath: '/api/:version/registry/repositories/:id/',
|
||||||
projectNotificationSettingsPath: '/api/:version/projects/:id/notification_settings',
|
projectNotificationSettingsPath: '/api/:version/projects/:id/notification_settings',
|
||||||
groupNotificationSettingsPath: '/api/:version/groups/:id/notification_settings',
|
groupNotificationSettingsPath: '/api/:version/groups/:id/notification_settings',
|
||||||
|
@ -883,33 +882,6 @@ const Api = {
|
||||||
return axios.delete(url);
|
return axios.delete(url);
|
||||||
},
|
},
|
||||||
|
|
||||||
fetchBillableGroupMembersList(namespaceId, options = {}, callback = () => {}) {
|
|
||||||
const url = Api.buildUrl(this.billableGroupMembersPath).replace(':id', namespaceId);
|
|
||||||
const defaults = {
|
|
||||||
per_page: DEFAULT_PER_PAGE,
|
|
||||||
page: 1,
|
|
||||||
};
|
|
||||||
|
|
||||||
const passedOptions = options;
|
|
||||||
|
|
||||||
// calling search API with empty string will not return results
|
|
||||||
if (!passedOptions.search) {
|
|
||||||
passedOptions.search = undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
return axios
|
|
||||||
.get(url, {
|
|
||||||
params: {
|
|
||||||
...defaults,
|
|
||||||
...passedOptions,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
.then(({ data, headers }) => {
|
|
||||||
callback(data);
|
|
||||||
return { data, headers };
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
async updateNotificationSettings(projectId, groupId, data = {}) {
|
async updateNotificationSettings(projectId, groupId, data = {}) {
|
||||||
let url = Api.buildUrl(this.notificationSettingsPath);
|
let url = Api.buildUrl(this.notificationSettingsPath);
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
import initClustersListApp from 'ee_else_ce/clusters_list';
|
import initClustersListApp from 'ee_else_ce/clusters_list';
|
||||||
import PersistentUserCallout from '~/persistent_user_callout';
|
import PersistentUserCallout from '~/persistent_user_callout';
|
||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', () => {
|
|
||||||
const callout = document.querySelector('.gcp-signup-offer');
|
const callout = document.querySelector('.gcp-signup-offer');
|
||||||
PersistentUserCallout.factory(callout);
|
PersistentUserCallout.factory(callout);
|
||||||
initClustersListApp();
|
initClustersListApp();
|
||||||
});
|
|
||||||
|
|
Loading…
Reference in New Issue