Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
8e211be724
commit
077a0d707f
|
|
@ -33,13 +33,18 @@ On self-managed GitLab, by default [migrating group items](#migrated-group-items
|
|||
feature, ask an administrator to [enable it in application settings](../../admin_area/settings/visibility_and_access_controls.md#enable-migration-of-groups-and-projects-by-direct-transfer).
|
||||
Also on self-managed GitLab, by default [migrating project items](#migrated-project-items) is not available. To show
|
||||
this feature, ask an administrator to [enable the feature flag](../../../administration/feature_flags.md) named
|
||||
`bulk_import_projects`. The feature is not ready for production use. On GitLab.com, migration of both groups and projects
|
||||
is available.
|
||||
`bulk_import_projects`. The feature is not ready for production use. On GitLab.com, migration of both groups and projects is available.
|
||||
|
||||
WARNING:
|
||||
When you migrate a group to GitLab.com, all its subgroups and projects are migrated too. This feature is in [Beta](../../../policy/alpha-beta-support.md#beta-features) and not ready for production use.
|
||||
On self-managed GitLab, migrating project items is not available by default. To show
|
||||
this Beta feature, ask an administrator to [enable the feature flag](../../../administration/feature_flags.md) named
|
||||
`bulk_import_projects`.
|
||||
|
||||
Prerequisites:
|
||||
|
||||
- Network connection between instances or GitLab.com. Must support HTTPS.
|
||||
- Both GitLab instances have migration enabled in application settings by instance administrator.
|
||||
- Both GitLab instances have [migration enabled in application settings](../../admin_area/settings/visibility_and_access_controls.md#enable-migration-of-groups-and-projects-by-direct-transfer) by instance administrator.
|
||||
- Owner role on the top-level group to migrate.
|
||||
|
||||
WARNING:
|
||||
|
|
@ -56,8 +61,6 @@ You can migrate:
|
|||
- By direct transfer using either the UI or the [API](../../../api/bulk_imports.md).
|
||||
- Many groups at once.
|
||||
|
||||
When migrating a top-level group to GitLab.com, all its subgroups and projects are migrated too.
|
||||
|
||||
Not all group and project resources are imported. See list of migrated resources below:
|
||||
|
||||
- [Migrated group items](#migrated-group-items).
|
||||
|
|
|
|||
|
|
@ -68,6 +68,8 @@ GitLab content imports that use GitHub accounts require that the GitHub public-f
|
|||
all comments and contributions are properly mapped to the same user in GitLab. GitHub Enterprise does not require this
|
||||
field to be populated so you may have to add it on existing accounts.
|
||||
|
||||
See also [Branch protection rules and project settings](#branch-protection-rules-and-project-settings) for additional prerequisites for those imports.
|
||||
|
||||
## Import your GitHub repository into GitLab
|
||||
|
||||
### Use the GitHub integration
|
||||
|
|
@ -247,7 +249,10 @@ When they are imported, supported GitHub branch protection rules are mapped to e
|
|||
| **Require signed commits** for the project's default branch | **Reject unsigned commits** GitLab [push rule](../repository/push_rules.md#prevent-unintended-consequences) **(PREMIUM)** | [GitLab 15.5](https://gitlab.com/gitlab-org/gitlab/-/issues/370949) |
|
||||
| **Allow force pushes - Everyone** | **Allowed to force push** [branch protection setting](../protected_branches.md#allow-force-push-on-a-protected-branch) | [GitLab 15.6](https://gitlab.com/gitlab-org/gitlab/-/issues/370943) |
|
||||
| **Require a pull request before merging - Require review from Code Owners** | **Require approval from code owners** [branch protection setting](../protected_branches.md#require-code-owner-approval-on-a-protected-branch) **(PREMIUM)** | [GitLab 15.6](https://gitlab.com/gitlab-org/gitlab/-/issues/376683) |
|
||||
| **Require a pull request before merging - Allow specified actors to bypass required pull requests** | List of users in the **Allowed to push** list of [branch protection settings](../protected_branches.md#configure-a-protected-branch) **(PREMIUM)** | [GitLab 15.8](https://gitlab.com/gitlab-org/gitlab/-/issues/384939) |
|
||||
| **Require a pull request before merging - Allow specified actors to bypass required pull requests** (1) | List of users in the **Allowed to push** list of [branch protection settings](../protected_branches.md#configure-a-protected-branch) **(PREMIUM)**. Without a Premium license, the list of users that are allowed to push is limited to roles. | [GitLab 15.8](https://gitlab.com/gitlab-org/gitlab/-/issues/384939) |
|
||||
|
||||
1. To successfully import the **Require a pull request before merging - Allow specified actors to bypass required pull requests** rule, you must add to the parent group in GitLab
|
||||
the users that are allowed to bypass required pull requests before you begin importing.
|
||||
|
||||
Mapping GitHub rule **Require status checks to pass before merging** to
|
||||
[external status checks](../merge_requests/status_checks.md) was considered in issue
|
||||
|
|
|
|||
|
|
@ -16285,12 +16285,18 @@ msgstr ""
|
|||
msgid "EscalationPolicies|Are you sure you want to delete the \"%{escalationPolicy}\" escalation policy? This action cannot be undone."
|
||||
msgstr ""
|
||||
|
||||
msgid "EscalationPolicies|Choose who to email if those contacted first about an alert don't respond."
|
||||
msgstr ""
|
||||
|
||||
msgid "EscalationPolicies|Create an escalation policy in GitLab"
|
||||
msgstr ""
|
||||
|
||||
msgid "EscalationPolicies|Delete escalation policy"
|
||||
msgstr ""
|
||||
|
||||
msgid "EscalationPolicies|Distinguishes this policy from others you may create (for example, \"Critical alert escalation\")."
|
||||
msgstr ""
|
||||
|
||||
msgid "EscalationPolicies|Edit escalation policy"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -16306,6 +16312,9 @@ msgstr ""
|
|||
msgid "EscalationPolicies|Escalation policy %{obstacle} in project %{project}"
|
||||
msgstr ""
|
||||
|
||||
msgid "EscalationPolicies|Escalation policy successfully created"
|
||||
msgstr ""
|
||||
|
||||
msgid "EscalationPolicies|Escalation rules"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -16321,6 +16330,9 @@ msgstr ""
|
|||
msgid "EscalationPolicies|Minutes must be between 0 and 1440."
|
||||
msgstr ""
|
||||
|
||||
msgid "EscalationPolicies|More detailed information about your policy."
|
||||
msgstr ""
|
||||
|
||||
msgid "EscalationPolicies|Remove escalation rule"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -16330,9 +16342,6 @@ msgstr ""
|
|||
msgid "EscalationPolicies|Select schedule"
|
||||
msgstr ""
|
||||
|
||||
msgid "EscalationPolicies|Set up escalation policies to define who is paged, and when, in the event the first users paged don't respond."
|
||||
msgstr ""
|
||||
|
||||
msgid "EscalationPolicies|THEN %{doAction} %{scheduleOrUser}"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -16345,6 +16354,9 @@ msgstr ""
|
|||
msgid "EscalationPolicies|This policy has no escalation rules."
|
||||
msgstr ""
|
||||
|
||||
msgid "EscalationPolicies|When a new alert is received, the users specified in the policy receive an email."
|
||||
msgstr ""
|
||||
|
||||
msgid "EscalationPolicies|mins"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ require (
|
|||
github.com/BurntSushi/toml v1.2.1
|
||||
github.com/FZambia/sentinel v1.1.1
|
||||
github.com/alecthomas/chroma/v2 v2.4.0
|
||||
github.com/aws/aws-sdk-go v1.44.167
|
||||
github.com/aws/aws-sdk-go v1.44.180
|
||||
github.com/disintegration/imaging v1.6.2
|
||||
github.com/getsentry/raven-go v0.2.0
|
||||
github.com/golang-jwt/jwt/v4 v4.4.3
|
||||
|
|
|
|||
|
|
@ -228,8 +228,8 @@ github.com/aws/aws-sdk-go v1.43.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4
|
|||
github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
|
||||
github.com/aws/aws-sdk-go v1.44.45/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
|
||||
github.com/aws/aws-sdk-go v1.44.68/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
|
||||
github.com/aws/aws-sdk-go v1.44.167 h1:kQmBhGdZkQLU7AiHShSkBJ15zr8agy0QeaxXduvyp2E=
|
||||
github.com/aws/aws-sdk-go v1.44.167/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
|
||||
github.com/aws/aws-sdk-go v1.44.180 h1:VLZuAHI9fa/3WME5JjpVjcPCNfpGHVMiHx8sLHWhMgI=
|
||||
github.com/aws/aws-sdk-go v1.44.180/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
|
||||
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
|
||||
github.com/aws/aws-sdk-go-v2 v1.16.8 h1:gOe9UPR98XSf7oEJCcojYg+N2/jCRm4DdeIsP85pIyQ=
|
||||
github.com/aws/aws-sdk-go-v2 v1.16.8/go.mod h1:6CpKuLXg2w7If3ABZCl/qZ6rEgwtjZTn4eAf4RcEyuw=
|
||||
|
|
|
|||
Loading…
Reference in New Issue