diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 03:07:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 03:07:31 +0000 |
| commit | 9caed104bc903734d996161ba13a579f2be49d7c (patch) | |
| tree | d7c3e6a534dfa85128f1011c4fb16f7f697d3f80 /doc/user | |
| parent | a59c9590f5171f3638a1b2abeff55157aedc577b (diff) | |
| download | gitlab-ce-9caed104bc903734d996161ba13a579f2be49d7c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/clusters/applications.md | 2 | ||||
| -rw-r--r-- | doc/user/project/repository/repository_mirroring.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md index 46b7eabaeea..f6ca8ef7f0b 100644 --- a/doc/user/clusters/applications.md +++ b/doc/user/clusters/applications.md @@ -481,7 +481,7 @@ applications you have configured. ### Install Ingress using GitLab CI -To install ingress, define the `.gitlab/managed-apps/config.yaml` file +To install Ingress, define the `.gitlab/managed-apps/config.yaml` file with: ```yaml diff --git a/doc/user/project/repository/repository_mirroring.md b/doc/user/project/repository/repository_mirroring.md index 7d49aecb603..993c96d2ae4 100644 --- a/doc/user/project/repository/repository_mirroring.md +++ b/doc/user/project/repository/repository_mirroring.md @@ -408,8 +408,8 @@ Note that this sample has a few limitations: - It does not regard different types of authentication mechanisms for the mirror. - It does not work with forced updates (rewriting history). - Only branches that match the `whitelisted` patterns will be proxy pushed. -- The script circumvents the git hook quarantine environment because the update of `$TARGET_REPO` - is seen as a ref update and git will complain about it. +- The script circumvents the Git hook quarantine environment because the update of `$TARGET_REPO` + is seen as a ref update and Git will complain about it. ### Mirroring with Perforce Helix via Git Fusion **(STARTER)** |