diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-09-27 10:36:27 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-09-27 10:36:27 +0000 |
| commit | b42e774021e5617abe6414c274763914c6b55c5b (patch) | |
| tree | 321660c89847ea88a5d6dbaa8fc0884d92789d85 /doc/ci | |
| parent | 3371c946d29c559cf9d5c53adfd731b09557b147 (diff) | |
| parent | fd7358a8cd532b309c03ab0990b3164856698aad (diff) | |
| download | gitlab-ce-b42e774021e5617abe6414c274763914c6b55c5b.tar.gz | |
Merge branch 'docs-fix-gitlab-capitalization-ce' into 'master'
Correcting Gitlab to GitLab in docs
See merge request gitlab-org/gitlab-ce!21827
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/examples/test-scala-application.md | 2 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/examples/test-scala-application.md b/doc/ci/examples/test-scala-application.md index 09d83c33f95..b3961ec91f3 100644 --- a/doc/ci/examples/test-scala-application.md +++ b/doc/ci/examples/test-scala-application.md @@ -1,6 +1,6 @@ # Test and deploy to Heroku a Scala application -This example demonstrates the integration of Gitlab CI with Scala +This example demonstrates the integration of GitLab CI with Scala applications using SBT. Checkout the example [project](https://gitlab.com/gitlab-examples/scala-sbt) and [build status](https://gitlab.com/gitlab-examples/scala-sbt/builds). diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 873a5c4301e..e38628b288b 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -188,7 +188,7 @@ used for time of the job. The configuration of this feature is covered in ## `before_script` and `after_script` -> Introduced in GitLab 8.7 and requires Gitlab Runner v1.2 +> Introduced in GitLab 8.7 and requires GitLab Runner v1.2 `before_script` is used to define the command that should be run before all jobs, including deploy jobs, but after the restoration of [artifacts](#artifacts). |