From 32e53ae7d739e9457ef81ba4a441a3acb4446240 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 15 Jul 2021 09:09:35 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/api.js | 2 +- app/assets/javascripts/api/constants.js | 1 - app/assets/javascripts/api/groups_api.js | 2 +- app/assets/javascripts/api/projects_api.js | 2 +- app/assets/javascripts/api/user_api.js | 2 +- app/assets/javascripts/boards/boards_util.js | 2 +- .../ide/components/ide_project_header.vue | 12 +- app/models/concerns/any_field_validation.rb | 25 ++ .../_repository_mirrors_form.html.haml | 7 +- .../application_settings/repository.html.haml | 1 + danger/vue_shared_documentation/Dangerfile | 22 ++ ...e_vulnerability_finding_evidence_assets.rb | 28 ++ db/schema_migrations/20210707171536 | 1 + db/structure.sql | 32 ++ .../geo/replication/configuration.md | 4 +- doc/administration/get_started.md | 291 ++++++++++++++++++ doc/administration/raketasks/maintenance.md | 2 +- .../reference_architectures/10k_users.md | 6 +- .../reference_architectures/25k_users.md | 6 +- .../reference_architectures/50k_users.md | 6 +- .../reference_architectures/5k_users.md | 199 +++++++++++- .../reference_architectures/index.md | 1 + doc/api/remote_mirrors.md | 2 +- .../bitbucket_integration.md | 2 +- .../github_integration.md | 2 +- doc/ci/pipelines/index.md | 2 +- doc/development/repository_mirroring.md | 2 +- doc/subscriptions/bronze_starter.md | 4 +- doc/topics/set_up_organization.md | 4 +- ...pository_mirroring_pull_settings_lower.png | Bin 58056 -> 0 bytes ...pository_mirroring_pull_settings_upper.png | Bin 50084 -> 0 bytes .../repository_mirroring_push_settings.png | Bin 31174 -> 0 bytes .../repository/repository_mirroring.md | 80 ++--- locale/gitlab.pot | 20 +- spec/frontend/boards/boards_util_spec.js | 33 +- .../ide/components/ide_project_header_spec.js | 44 +++ spec/tooling/danger/project_helper_spec.rb | 2 +- tooling/danger/project_helper.rb | 1 + 38 files changed, 759 insertions(+), 93 deletions(-) delete mode 100644 app/assets/javascripts/api/constants.js create mode 100644 app/models/concerns/any_field_validation.rb create mode 100644 danger/vue_shared_documentation/Dangerfile create mode 100644 db/migrate/20210707171536_create_vulnerability_finding_evidence_assets.rb create mode 100644 db/schema_migrations/20210707171536 create mode 100644 doc/administration/get_started.md delete mode 100644 doc/user/project/repository/img/repository_mirroring_pull_settings_lower.png delete mode 100644 doc/user/project/repository/img/repository_mirroring_pull_settings_upper.png delete mode 100644 doc/user/project/repository/img/repository_mirroring_push_settings.png create mode 100644 spec/frontend/ide/components/ide_project_header_spec.js 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 @@