Commit 1c123259 authored by Evan Read's avatar Evan Read

Merge branch 'docs-mirroring-refs-ee' into 'master'

Docs: EE Port: Fix some references to the mirroring doc

See merge request gitlab-org/gitlab-ee!9406
parents 2333f56a 536745cf
...@@ -144,4 +144,4 @@ your Git repository via URL. ...@@ -144,4 +144,4 @@ your Git repository via URL.
GitLab is now configured to mirror changes from Bitbucket, run CI/CD pipelines GitLab is now configured to mirror changes from Bitbucket, run CI/CD pipelines
configured in `.gitlab-ci.yml` and push the status to Bitbucket. configured in `.gitlab-ci.yml` and push the status to Bitbucket.
[pull-mirroring]: ../../workflow/repository_mirroring.md#pulling-from-a-remote-repository [pull-mirroring]: ../../workflow/repository_mirroring.md#pulling-from-a-remote-repository-starter
...@@ -114,5 +114,5 @@ your repository. ...@@ -114,5 +114,5 @@ your repository.
[cicd-projects]: ../../user/project/ci_cd_for_external_repo.md [cicd-projects]: ../../user/project/ci_cd_for_external_repo.md
[github-integration]: ../../integration/github.md [github-integration]: ../../integration/github.md
[github-project-integration]: ../../user/project/integrations/github.md [github-project-integration]: ../../user/project/integrations/github.md
[pull-mirroring]: ../../workflow/repository_mirroring.md#pulling-from-a-remote-repository [pull-mirroring]: ../../workflow/repository_mirroring.md#pulling-from-a-remote-repository-starter
[pull-mirroring-trigger]: ../../api/projects.md#start-the-pull-mirroring-process-for-a-project [pull-mirroring-trigger]: ../../api/projects.md#start-the-pull-mirroring-process-for-a-project
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
> Introduced in GitLab 8.8. > Introduced in GitLab 8.8.
NOTE: **Note:** NOTE: **Note:**
If you have a [mirrored repository where GitLab pulls from](../workflow/repository_mirroring.md#pulling-from-a-remote-repository), If you have a [mirrored repository where GitLab pulls from](../workflow/repository_mirroring.md#pulling-from-a-remote-repository-starter),
you may need to enable pipeline triggering in your project's you may need to enable pipeline triggering in your project's
**Settings > Repository > Pull from a remote repository > Trigger pipelines for mirror updates**. **Settings > Repository > Pull from a remote repository > Trigger pipelines for mirror updates**.
......
...@@ -127,7 +127,7 @@ Now if you go to the **Pipelines** page you will see that the pipeline is ...@@ -127,7 +127,7 @@ Now if you go to the **Pipelines** page you will see that the pipeline is
pending. pending.
NOTE: **Note:** NOTE: **Note:**
If you have a [mirrored repository where GitLab pulls from](../../workflow/repository_mirroring.md#pulling-from-a-remote-repository), If you have a [mirrored repository where GitLab pulls from](../../workflow/repository_mirroring.md#pulling-from-a-remote-repository-starter),
you may need to enable pipeline triggering in your project's you may need to enable pipeline triggering in your project's
**Settings > Repository > Pull from a remote repository > Trigger pipelines for mirror updates**. **Settings > Repository > Pull from a remote repository > Trigger pipelines for mirror updates**.
......
...@@ -11,7 +11,7 @@ If you want a quick introduction to GitLab CI, follow our ...@@ -11,7 +11,7 @@ If you want a quick introduction to GitLab CI, follow our
[quick start guide](../quick_start/README.md). [quick start guide](../quick_start/README.md).
NOTE: **Note:** NOTE: **Note:**
If you have a [mirrored repository where GitLab pulls from](../../workflow/repository_mirroring.md#pulling-from-a-remote-repository), If you have a [mirrored repository where GitLab pulls from](../../workflow/repository_mirroring.md#pulling-from-a-remote-repository-starter),
you may need to enable pipeline triggering in your project's you may need to enable pipeline triggering in your project's
**Settings > Repository > Pull from a remote repository > Trigger pipelines for mirror updates**. **Settings > Repository > Pull from a remote repository > Trigger pipelines for mirror updates**.
......
...@@ -55,7 +55,7 @@ When push mirroring is enabled, only push commits directly to the mirrored repos ...@@ -55,7 +55,7 @@ When push mirroring is enabled, only push commits directly to the mirrored repos
mirror diverging. All changes will end up in the mirrored repository whenever: mirror diverging. All changes will end up in the mirrored repository whenever:
- Commits are pushed to GitLab. - Commits are pushed to GitLab.
- A [forced update](#forcing-an-update) is initiated. - A [forced update](#forcing-an-update-core) is initiated.
Changes pushed to files in the repository are automatically pushed to the remote mirror at least: Changes pushed to files in the repository are automatically pushed to the remote mirror at least:
...@@ -122,7 +122,7 @@ directly to the repository on GitLab. Instead, any commits should be pushed to t ...@@ -122,7 +122,7 @@ directly to the repository on GitLab. Instead, any commits should be pushed to t
Changes pushed to the upstream repository will be pulled into the GitLab repository, either: Changes pushed to the upstream repository will be pulled into the GitLab repository, either:
- Automatically within a certain period of time. - Automatically within a certain period of time.
- When a [forced update](#forcing-an-update) is initiated. - When a [forced update](#forcing-an-update-core) is initiated.
CAUTION: **Caution:** CAUTION: **Caution:**
If you do manually update a branch in the GitLab repository, the branch will become diverged from If you do manually update a branch in the GitLab repository, the branch will become diverged from
...@@ -259,7 +259,7 @@ failed. This will become visible in either the: ...@@ -259,7 +259,7 @@ failed. This will become visible in either the:
- Pull mirror settings page. - Pull mirror settings page.
When a project is hard failed, it will no longer get picked up for mirroring. A user can resume the When a project is hard failed, it will no longer get picked up for mirroring. A user can resume the
project mirroring again by [Forcing an update](#forcing-an-update). project mirroring again by [Forcing an update](#forcing-an-update-core).
### Trigger update using API **[STARTER]** ### Trigger update using API **[STARTER]**
...@@ -292,8 +292,8 @@ them and how they will be resolved. ...@@ -292,8 +292,8 @@ them and how they will be resolved.
Rewriting any mirrored commit on either remote will cause conflicts and mirroring to fail. This can Rewriting any mirrored commit on either remote will cause conflicts and mirroring to fail. This can
be prevented by: be prevented by:
- [Pulling only protected branches](#pull-only-protected-branches). - [Pulling only protected branches](#only-mirror-protected-branches-starter).
- [Pushing only protected branches](#push-only-protected-branches). - [Pushing only protected branches](#push-only-protected-branches-core).
You should [protect the branches](../user/project/protected_branches.md) you wish to mirror on both You should [protect the branches](../user/project/protected_branches.md) you wish to mirror on both
remotes to prevent conflicts caused by rewriting history. remotes to prevent conflicts caused by rewriting history.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment