diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-21 15:08:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-21 15:08:33 +0300 |
| commit | 6c44b676312eb6cdffadef45f9ca3e29a8cc92ab (patch) | |
| tree | 06666cd369ac9ad0533cec689f2c2b4fb826f797 /doc/ci | |
| parent | c1cea595b6a9b4d85424e9afd2cb765101ee04bf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/components/index.md | 2 | ||||
| -rw-r--r-- | doc/ci/examples/end_to_end_testing_webdriverio/index.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/components/index.md b/doc/ci/components/index.md index ae35b3779c3..77de209dc50 100644 --- a/doc/ci/components/index.md +++ b/doc/ci/components/index.md @@ -367,7 +367,7 @@ This action is not reversible. Any existing CI template, that you share with other projects via `include:` syntax, can be converted to a CI component. -1. Decide whether you want the component to be part of an existing [components repository](#components-repository), +1. Decide whether you want the component to be part of an existing [components repository](#components-repository), if you want to logically group components together. Create and setup a [components repository](#components-repository) otherwise. 1. Create a YAML file in the components repository according to the expected [directory structure](#directory-structure). 1. Copy the content of the template YAML file into the new component YAML file. diff --git a/doc/ci/examples/end_to_end_testing_webdriverio/index.md b/doc/ci/examples/end_to_end_testing_webdriverio/index.md index ee8b6bb30b6..eb956f66dd7 100644 --- a/doc/ci/examples/end_to_end_testing_webdriverio/index.md +++ b/doc/ci/examples/end_to_end_testing_webdriverio/index.md @@ -154,7 +154,7 @@ to interact with your application, so we need to install and run them. Furthermore, WebdriverIO uses Selenium as a common interface to control different browsers, so we need to install and run Selenium as well. Luckily, the Selenium project provides the Docker images for Firefox [standalone-firefox](https://hub.docker.com/r/selenium/standalone-firefox/) and -and for Chrome [standalone-chrome](https://hub.docker.com/r/selenium/standalone-chrome/). +and for Chrome [standalone-chrome](https://hub.docker.com/r/selenium/standalone-chrome/). (Since Safari and Internet Explorer/Edge are not open source and not available for Linux, we are unfortunately unable to use those in GitLab CI/CD). |