Commit 22c869c3 authored by Marcel Amirault's avatar Marcel Amirault Committed by Fatih Acet

Change config to configuration

For consistency, change config to configuration for
custom ci path feature
parent 2ed0bc63
...@@ -51,10 +51,10 @@ ...@@ -51,10 +51,10 @@
%hr %hr
.form-group .form-group
= f.label :ci_config_path, _('Custom CI config path'), class: 'label-bold' = f.label :ci_config_path, _('Custom CI configuration path'), class: 'label-bold'
= f.text_field :ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml' = f.text_field :ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml'
%p.form-text.text-muted %p.form-text.text-muted
= _("The path to CI config file. Defaults to <code>.gitlab-ci.yml</code>").html_safe = _("The path to the CI configuration file. Defaults to <code>.gitlab-ci.yml</code>").html_safe
= link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'custom-ci-config-path'), target: '_blank' = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'custom-ci-config-path'), target: '_blank'
%hr %hr
......
...@@ -85,7 +85,7 @@ GitLab CI/CD supports numerous configuration options: ...@@ -85,7 +85,7 @@ GitLab CI/CD supports numerous configuration options:
| [Job artifacts](../user/project/pipelines/job_artifacts.md) | Output, use, and reuse job artifacts. | | [Job artifacts](../user/project/pipelines/job_artifacts.md) | Output, use, and reuse job artifacts. |
| [Cache dependencies](caching/index.md) | Cache your dependencies for a faster execution. | | [Cache dependencies](caching/index.md) | Cache your dependencies for a faster execution. |
| [Schedule pipelines](../user/project/pipelines/schedules.md) | Schedule pipelines to run as often as you need. | | [Schedule pipelines](../user/project/pipelines/schedules.md) | Schedule pipelines to run as often as you need. |
| [Custom path for `.gitlab-ci.yml`](../user/project/pipelines/settings.md#custom-ci-config-path) | Define a custom path for the CI/CD configuration file. | | [Custom path for `.gitlab-ci.yml`](../user/project/pipelines/settings.md#custom-ci-configuration-path) | Define a custom path for the CI/CD configuration file. |
| [Git submodules for CI/CD](git_submodules.md) | Configure jobs for using Git submodules.| | [Git submodules for CI/CD](git_submodules.md) | Configure jobs for using Git submodules.|
| [SSH keys for CI/CD](ssh_keys/README.md) | Using SSH keys in your CI pipelines. | | [SSH keys for CI/CD](ssh_keys/README.md) | Using SSH keys in your CI pipelines. |
| [Pipelines triggers](triggers/README.md) | Trigger pipelines through the API. | | [Pipelines triggers](triggers/README.md) | Trigger pipelines through the API. |
......
...@@ -65,14 +65,14 @@ Project defined timeout (either specific timeout set by user or the default ...@@ -65,14 +65,14 @@ Project defined timeout (either specific timeout set by user or the default
For information about setting a maximum artifact size for a project, see For information about setting a maximum artifact size for a project, see
[Maximum artifacts size](../../admin_area/settings/continuous_integration.md#maximum-artifacts-size-core-only). [Maximum artifacts size](../../admin_area/settings/continuous_integration.md#maximum-artifacts-size-core-only).
## Custom CI config path ## Custom CI configuration path
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/12509) in GitLab 9.4. > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/12509) in GitLab 9.4.
By default we look for the `.gitlab-ci.yml` file in the project's root By default we look for the `.gitlab-ci.yml` file in the project's root
directory. If you require a different location **within** the repository, directory. If you require a different location **within** the repository,
you can set a custom filepath that will be used to lookup the config file, you can set a custom path that will be used to look up the configuration file,
this filepath should be **relative** to the root. this path should be **relative** to the root.
Here are some valid examples: Here are some valid examples:
...@@ -85,7 +85,7 @@ The path can be customized at a project level. To customize the path: ...@@ -85,7 +85,7 @@ The path can be customized at a project level. To customize the path:
1. Go to the project's **Settings > CI / CD**. 1. Go to the project's **Settings > CI / CD**.
1. Expand the **General pipelines** section. 1. Expand the **General pipelines** section.
1. Provide a value in the **Custom CI config path** field. 1. Provide a value in the **Custom CI configuration path** field.
1. Click **Save changes**. 1. Click **Save changes**.
## Test coverage parsing ## Test coverage parsing
......
...@@ -4813,7 +4813,7 @@ msgstr "" ...@@ -4813,7 +4813,7 @@ msgstr ""
msgid "CurrentUser|Settings" msgid "CurrentUser|Settings"
msgstr "" msgstr ""
msgid "Custom CI config path" msgid "Custom CI configuration path"
msgstr "" msgstr ""
msgid "Custom hostname (for private commit emails)" msgid "Custom hostname (for private commit emails)"
...@@ -16320,7 +16320,7 @@ msgstr "" ...@@ -16320,7 +16320,7 @@ msgstr ""
msgid "The passphrase required to decrypt the private key. This is optional and the value is encrypted at rest." msgid "The passphrase required to decrypt the private key. This is optional and the value is encrypted at rest."
msgstr "" msgstr ""
msgid "The path to CI config file. Defaults to <code>.gitlab-ci.yml</code>" msgid "The path to the CI configuration file. Defaults to <code>.gitlab-ci.yml</code>"
msgstr "" msgstr ""
msgid "The phase of the development lifecycle." msgid "The phase of the development lifecycle."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment