diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 00:09:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 00:09:51 +0000 |
| commit | 6b75388b67c35271bc18f2dbd41a72accd927808 (patch) | |
| tree | 0e905919b117b731ea22ef629f45701e6124c1ee /doc | |
| parent | 260c87f94ecc8802de4f7cd16d10c0a08d19559c (diff) | |
| download | gitlab-ce-6b75388b67c35271bc18f2dbd41a72accd927808.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-9-stable-ee
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/clusters/agent/install/index.md | 4 | ||||
| -rw-r--r-- | doc/user/project/import/github.md | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/doc/user/clusters/agent/install/index.md b/doc/user/clusters/agent/install/index.md index bb9a9c371a2..297210ab8ef 100644 --- a/doc/user/clusters/agent/install/index.md +++ b/doc/user/clusters/agent/install/index.md @@ -155,10 +155,6 @@ helm upgrade --install gitlab-agent gitlab/gitlab-agent \ ... ``` -NOTE: -DNS rebind protection is disabled when either the HTTP_PROXY or the HTTPS_PROXY environment variable is set, -and the domain DNS can't be resolved. - #### Advanced installation method GitLab also provides a [KPT package for the agent](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/tree/master/build/deployment/gitlab-agent). This method provides greater flexibility, but is only recommended for advanced users. diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md index 9298dab6f64..eeebb5a166c 100644 --- a/doc/user/project/import/github.md +++ b/doc/user/project/import/github.md @@ -7,8 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Import your project from GitHub to GitLab **(FREE)** -> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/381902) in GitLab 15.8, GitLab no longer automatically creates namespaces or groups that don't exist. GitLab also no longer falls back to using the user's personal namespace if the namespace or group name is taken. -> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/378267) in GitLab 15.9, GitLab instances behind proxies no longer require `github.com` and `api.github.com` entries in the [allowlist for local requests](../../../security/webhooks.md#create-an-allowlist-for-local-requests). +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/381902) in GitLab 15.8, GitLab no longer automatically creates namespaces or groups that don't exist. GitLab also no longer falls back to using the user's personal namespace if the namespace or group name is taken. You can import your GitHub projects from either GitHub.com or GitHub Enterprise. Importing projects does not migrate or import any types of groups or organizations from GitHub to GitLab. @@ -63,8 +62,9 @@ prerequisites for those imports. If you are importing from GitHub Enterprise to a self-managed GitLab instance: - You must first enable the [GitHub integration](../../../integration/github.md). -- For GitLab 15.8 and earlier, you must add `github.com` and `api.github.com` entries in the - [allowlist for local requests](../../../security/webhooks.md#create-an-allowlist-for-local-requests). +- If GitLab is behind a HTTP/HTTPS proxy, you must populate the [allowlist for local requests](../../../security/webhooks.md#create-an-allowlist-for-local-requests) + with `github.com` and `api.github.com` to solve the hostname. For more information, read the issue + [Importing a GitHub project requires DNS resolution even when behind a proxy](https://gitlab.com/gitlab-org/gitlab/-/issues/37941). ### Importing from GitHub.com to self-managed GitLab |