diff options
Diffstat (limited to 'doc/topics')
| -rw-r--r-- | doc/topics/autodevops/index.md | 26 | ||||
| -rw-r--r-- | doc/topics/git/numerous_undo_possibilities_in_git/index.md | 12 |
2 files changed, 19 insertions, 19 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index ebeb5270884..e42c89ac567 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -158,7 +158,7 @@ as other environment [variables](../../ci/variables/README.md#priority-of-enviro NOTE: **Note** `AUTO_DEVOPS_DOMAIN` environment variable is deprecated and -[is scheduled to be removed](https://gitlab.com/gitlab-org/gitlab-ce/issues/56959). +[is scheduled to be removed](https://gitlab.com/gitlab-org/gitlab-foss/issues/56959). A wildcard DNS A record matching the base domain(s) is required, for example, given a base domain of `example.com`, you'd need a DNS entry like: @@ -182,7 +182,7 @@ them to the Kubernetes pods that run your application(s). NOTE: **Note:** From GitLab 11.8, `KUBE_INGRESS_BASE_DOMAIN` replaces `AUTO_DEVOPS_DOMAIN`. Support for `AUTO_DEVOPS_DOMAIN` was [removed in GitLab -12.0](https://gitlab.com/gitlab-org/gitlab-ce/issues/56959). +12.0](https://gitlab.com/gitlab-org/gitlab-foss/issues/56959). ## Using multiple Kubernetes clusters **(PREMIUM)** @@ -252,7 +252,7 @@ Auto DevOps at the group and project level, respectively. ### At the group level -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/52447) in GitLab 11.10. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/52447) in GitLab 11.10. Only administrators and group owners can enable or disable Auto DevOps at the group level. @@ -289,7 +289,7 @@ This can be enabled from the console with the following, which uses the example ### Deployment strategy -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/38542) in GitLab 11.0. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/38542) in GitLab 11.0. You can change the deployment strategy used by Auto DevOps by going to your project's **Settings > CI/CD > Auto DevOps**. @@ -472,7 +472,7 @@ namespace](../../user/project/clusters/index.md#deployment-variables) for the environment. Since GitLab 11.4, a [local -Tiller](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22036) is +Tiller](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/22036) is used. Previous versions of GitLab had a Tiller installed in the project namespace. @@ -538,7 +538,7 @@ namespace](../../user/project/clusters/index.md#deployment-variables) for the environment. Since GitLab 11.4, a [local -Tiller](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22036) is +Tiller](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/22036) is used. Previous versions of GitLab had a Tiller installed in the project namespace. @@ -930,7 +930,7 @@ The following table lists variables used to disable jobs. #### Application secret variables -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/49056) in GitLab 11.7. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/49056) in GitLab 11.7. Some applications need to define secret variables that are accessible by the deployed application. Auto DevOps detects variables where the key starts with @@ -1075,7 +1075,7 @@ If `CANARY_ENABLED` is defined in your project (e.g., set `CANARY_ENABLED` to #### Incremental rollout to production **(PREMIUM)** -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/5415) in GitLab 10.8. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/5415) in GitLab 10.8. TIP: **Tip:** You can also set this inside your [project's settings](#deployment-strategy). @@ -1133,7 +1133,7 @@ This configuration is deprecated and will be removed in the future. #### Timed incremental rollout to production **(PREMIUM)** -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/7545) in GitLab 11.4. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/7545) in GitLab 11.4. TIP: **Tip:** You can also set this inside your [project's settings](#deployment-strategy). @@ -1259,16 +1259,16 @@ Or through the HTTP API with an admin access token: curl --data "value=true" --header "PRIVATE-TOKEN: personal_access_token" https://gitlab.example.com/api/v4/features/auto_devops_banner_disabled ``` -[ce-37115]: https://gitlab.com/gitlab-org/gitlab-ce/issues/37115 +[ce-37115]: https://gitlab.com/gitlab-org/gitlab-foss/issues/37115 [kubernetes-clusters]: ../../user/project/clusters/index.md [docker-in-docker]: ../../docker/using_docker_build.md#use-docker-in-docker-executor [review-app]: ../../ci/review_apps/index.md [container-registry]: ../../user/packages/container_registry/index.md [postgresql]: https://www.postgresql.org/ -[Auto DevOps template]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +[Auto DevOps template]: https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml [ee]: https://about.gitlab.com/pricing/ -[ce-21955]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21955 -[ce-19507]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19507 +[ce-21955]: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/21955 +[ce-19507]: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/19507 ## Development guides diff --git a/doc/topics/git/numerous_undo_possibilities_in_git/index.md b/doc/topics/git/numerous_undo_possibilities_in_git/index.md index 5cae532bf54..2ab03df095c 100644 --- a/doc/topics/git/numerous_undo_possibilities_in_git/index.md +++ b/doc/topics/git/numerous_undo_possibilities_in_git/index.md @@ -401,11 +401,11 @@ the cleanup of detached commits (happens automatically). ### Where modifying history is generally acceptable Modified history breaks the development chain of other developers, as changed -history does not have matching commits'ids. For that reason it should not -be used on any public branch or on branch that *might* be used by other -developers. When contributing to big open source repositories (for example, [GitLab CE][gitlab-ce]), -it is acceptable to *squash* commits into a single one, to present -a nicer history of your contribution. +history does not have matching commits'ids. For that reason it should not be +used on any public branch or on branch that *might* be used by other developers. +When contributing to big open source repositories (for example, [GitLab][gitlab] +itself), it is acceptable to *squash* commits into a single one, to present a +nicer history of your contribution. Keep in mind that this also removes the comments attached to certain commits in merge requests, so if you need to retain traceability in GitLab, then @@ -520,6 +520,6 @@ but commented out to help encourage others to add to it in the future. --> [git-distributed]: https://git-scm.com/about/distributed [git-filters-manual]: https://git-scm.com/docs/git-filter-branch#_options [git-official]: https://git-scm.com/ -[gitlab-ce]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#contribution-acceptance-criteria +[gitlab]: https://gitlab.com/gitlab-org/gitlab/blob/master/CONTRIBUTING.md#contribution-acceptance-criteria [gitlab-flow]: https://about.gitlab.com/2014/09/29/gitlab-flow/ [gitlab-git-tips-n-tricks]: https://about.gitlab.com/2016/12/08/git-tips-and-tricks/ |