diff options
Diffstat (limited to 'doc/ci')
-rw-r--r-- | doc/ci/examples/laravel_with_gitlab_and_envoy/index.md | 2 | ||||
-rw-r--r-- | doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md | 2 | ||||
-rw-r--r-- | doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md | 4 | ||||
-rw-r--r-- | doc/ci/pipelines/index.md | 2 | ||||
-rw-r--r-- | doc/ci/pipelines/settings.md | 2 | ||||
-rw-r--r-- | doc/ci/variables/README.md | 2 | ||||
-rw-r--r-- | doc/ci/yaml/README.md | 10 |
7 files changed, 12 insertions, 12 deletions
diff --git a/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md b/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md index c8f5d48c4ef..07b054dd2cb 100644 --- a/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md +++ b/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md @@ -277,7 +277,7 @@ The `releases` directory will hold all our deployments: ... ``` -While our project grows, its Git history will be very very long over time. +While our project grows, its Git history will be very long over time. Since we are creating a directory per release, it might not be necessary to have the history of the project downloaded for each release. The `--depth 1` option is a great solution which saves systems time and disk space as well. diff --git a/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md b/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md index 0ab5bf1e3bb..e480f4565ce 100644 --- a/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md +++ b/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md @@ -77,6 +77,6 @@ gitlab-runner register \ --docker-services latest ``` -With the command above, you create a Runner that uses the [ruby:2.6](https://hub.docker.com/_/ruby) image and uses a [PostgreSQL](https://hub.docker.com/_/postgres) database. +With the command above, you create a Runner that uses the [`ruby:2.6`](https://hub.docker.com/_/ruby) image and uses a [PostgreSQL](https://hub.docker.com/_/postgres) database. To access the PostgreSQL database, connect to `host: postgres` as user `postgres` with no password. diff --git a/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md b/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md index 27e30dd3a10..6d92c86c819 100644 --- a/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md +++ b/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md @@ -12,7 +12,7 @@ last_updated: 2019-03-06 [Phoenix](https://www.phoenixframework.org/) is a web development framework written in [Elixir](https://elixir-lang.org), which is a functional language designed for productivity and maintainability that runs on the -[Erlang VM](https://www.erlang.org). Erlang VM is really really fast and can handle very large numbers of +[Erlang VM](https://www.erlang.org). Erlang VM is really fast and can handle very large numbers of simultaneous users. That's why we're hearing so much about Phoenix today. @@ -389,7 +389,7 @@ source project being watched and contributed by the community, it is really impo code permanently working. GitLab CI/CD is a time saving powerful tool to help us maintain our code organized and working. -As we could see in this post, GitLab CI/CD is really really easy to configure and use. We have [many +As we could see in this post, GitLab CI/CD is really easy to configure and use. We have [many other reasons](https://about.gitlab.com/blog/2015/02/03/7-reasons-why-you-should-be-using-ci/) to keep using GitLab CI/CD. The benefits to our teams will be huge! diff --git a/doc/ci/pipelines/index.md b/doc/ci/pipelines/index.md index 18f5c5f6827..5ce4e1649bc 100644 --- a/doc/ci/pipelines/index.md +++ b/doc/ci/pipelines/index.md @@ -475,7 +475,7 @@ to an updated status. This functionality is only available: - For users with at least Developer access. -- If the the stage contains [manual actions](#manual-actions-from-pipeline-graphs). +- If the stage contains [manual actions](#manual-actions-from-pipeline-graphs). ### Deleting a single pipeline diff --git a/doc/ci/pipelines/settings.md b/doc/ci/pipelines/settings.md index b1c5ee6e24f..bddf64f397e 100644 --- a/doc/ci/pipelines/settings.md +++ b/doc/ci/pipelines/settings.md @@ -117,7 +117,7 @@ job log using a regular expression. In the pipelines settings, search for the ![Pipelines settings test coverage](img/pipelines_settings_test_coverage.png) -Leave blank if you want to disable it or enter a ruby regular expression. You +Leave blank if you want to disable it or enter a Ruby regular expression. You can use <https://rubular.com> to test your regex. If the pipeline succeeds, the coverage is shown in the merge request widget and diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index afa2e247679..d363a4387d9 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -429,7 +429,7 @@ Once you set them, they will be available for all subsequent pipelines. You can limit the environment scope of a variable by [defining which environments](../environments.md) it can be available for. -To learn more about about scoping environments, see [Scoping environments with specs](../environments.md#scoping-environments-with-specs). +To learn more about scoping environments, see [Scoping environments with specs](../environments.md#scoping-environments-with-specs). ### Deployment environment variables diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index b72cf25282b..558ae5e20d3 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -318,25 +318,25 @@ For: An [extended docker configuration option](../docker/using_docker_images.md#extended-docker-configuration-options). -For more information, see see [Available settings for `services`](../docker/using_docker_images.md#available-settings-for-services). +For more information, see [Available settings for `services`](../docker/using_docker_images.md#available-settings-for-services). #### `services:alias` An [extended docker configuration option](../docker/using_docker_images.md#extended-docker-configuration-options). -For more information, see see [Available settings for `services`](../docker/using_docker_images.md#available-settings-for-services). +For more information, see [Available settings for `services`](../docker/using_docker_images.md#available-settings-for-services). #### `services:entrypoint` An [extended docker configuration option](../docker/using_docker_images.md#extended-docker-configuration-options). -For more information, see see [Available settings for `services`](../docker/using_docker_images.md#available-settings-for-services). +For more information, see [Available settings for `services`](../docker/using_docker_images.md#available-settings-for-services). #### `services:command` An [extended docker configuration option](../docker/using_docker_images.md#extended-docker-configuration-options). -For more information, see see [Available settings for `services`](../docker/using_docker_images.md#available-settings-for-services). +For more information, see [Available settings for `services`](../docker/using_docker_images.md#available-settings-for-services). ### `before_script` and `after_script` @@ -1630,7 +1630,7 @@ The `stop_review_app` job is **required** to have the following keywords defined > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/20956) in GitLab 12.8. The `auto_stop_in` keyword is for specifying life period of the environment, -that when expired, GitLab GitLab automatically stops them. +that when expired, GitLab automatically stops them. For example, |