diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index 1bb19208828..84a5d5ae4b3 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -3,7 +3,7 @@ import { __ } from '~/locale'; import axios from './lib/utils/axios_utils'; import { joinPaths } from './lib/utils/url_utility'; -const DEFAULT_PER_PAGE = 20; +export const DEFAULT_PER_PAGE = 20; /** * Slow deprecation Notice: Please rather use for new calls diff --git a/app/assets/javascripts/api/constants.js b/app/assets/javascripts/api/constants.js deleted file mode 100644 index b6c720a85f3..00000000000 --- a/app/assets/javascripts/api/constants.js +++ /dev/null @@ -1 +0,0 @@ -export const DEFAULT_PER_PAGE = 20; diff --git a/app/assets/javascripts/api/groups_api.js b/app/assets/javascripts/api/groups_api.js index d6c9e1d42cc..a563afc6abb 100644 --- a/app/assets/javascripts/api/groups_api.js +++ b/app/assets/javascripts/api/groups_api.js @@ -1,6 +1,6 @@ +import { DEFAULT_PER_PAGE } from '~/api'; import axios from '../lib/utils/axios_utils'; import { buildApiUrl } from './api_utils'; -import { DEFAULT_PER_PAGE } from './constants'; const GROUPS_PATH = '/api/:version/groups.json'; const DESCENDANT_GROUPS_PATH = '/api/:version/groups/:id/descendant_groups'; diff --git a/app/assets/javascripts/api/projects_api.js b/app/assets/javascripts/api/projects_api.js index d9a2467cff3..1cd7fb0b954 100644 --- a/app/assets/javascripts/api/projects_api.js +++ b/app/assets/javascripts/api/projects_api.js @@ -1,6 +1,6 @@ +import { DEFAULT_PER_PAGE } from '~/api'; import axios from '../lib/utils/axios_utils'; import { buildApiUrl } from './api_utils'; -import { DEFAULT_PER_PAGE } from './constants'; const PROJECTS_PATH = '/api/:version/projects.json'; diff --git a/app/assets/javascripts/api/user_api.js b/app/assets/javascripts/api/user_api.js index fba47119a08..09995fad628 100644 --- a/app/assets/javascripts/api/user_api.js +++ b/app/assets/javascripts/api/user_api.js @@ -1,8 +1,8 @@ +import { DEFAULT_PER_PAGE } from '~/api'; import createFlash from '~/flash'; import { __ } from '~/locale'; import axios from '../lib/utils/axios_utils'; import { buildApiUrl } from './api_utils'; -import { DEFAULT_PER_PAGE } from './constants'; const USER_COUNTS_PATH = '/api/:version/user_counts'; const USERS_PATH = '/api/:version/users.json'; diff --git a/app/assets/javascripts/boards/boards_util.js b/app/assets/javascripts/boards/boards_util.js index 2f53151ce73..46f97e09385 100644 --- a/app/assets/javascripts/boards/boards_util.js +++ b/app/assets/javascripts/boards/boards_util.js @@ -107,8 +107,8 @@ export function formatIssueInput(issueInput, boardConfig) { const { labels, assigneeId, milestoneId } = boardConfig; return { - milestoneId: milestoneId ? fullMilestoneId(milestoneId) : null, ...issueInput, + milestoneId: milestoneId ? fullMilestoneId(milestoneId) : null, labelIds: [...labelIds, ...(labels?.map((l) => fullLabelId(l)) || [])], assigneeIds: [...assigneeIds, ...(assigneeId ? [fullUserId(assigneeId)] : [])], }; diff --git a/app/assets/javascripts/ide/components/ide_project_header.vue b/app/assets/javascripts/ide/components/ide_project_header.vue index d7582e99463..1c25a8e634d 100644 --- a/app/assets/javascripts/ide/components/ide_project_header.vue +++ b/app/assets/javascripts/ide/components/ide_project_header.vue @@ -1,9 +1,9 @@