diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-06-30 15:23:46 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-06-30 15:23:46 +0800 |
| commit | 17ba052f5c9d7c390b350469d15ffc674a943b07 (patch) | |
| tree | 4b995a0b28d018d2b04b110d874c4211e009dcc6 /doc | |
| parent | 62fdbbeeb01810f9215a7b8bdf880901fcb48c65 (diff) | |
| download | gitlab-ce-17ba052f5c9d7c390b350469d15ffc674a943b07.tar.gz | |
Update wordings, allow only full path, add tests
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/projects.md | 6 | ||||
| -rw-r--r-- | doc/user/project/pipelines/settings.md | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md index ea349ae8f68..7565f18e907 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -346,7 +346,7 @@ Parameters: | `tag_list` | array | no | The list of tags for a project; put array of tags, that should be finally assigned to a project | | `avatar` | mixed | no | Image file for avatar of the project | | `printing_merge_request_link_enabled` | boolean | no | Show link to create/view merge request when pushing from the command line | -| `ci_config_file` | boolean | no | The relative path to the CI config file (E.g. my/path or my/path/.gitlab-ci.yml or my/path/my-config.yml) | +| `ci_config_file` | boolean | no | The path to CI config file | ### Create project for user @@ -383,7 +383,7 @@ Parameters: | `tag_list` | array | no | The list of tags for a project; put array of tags, that should be finally assigned to a project | | `avatar` | mixed | no | Image file for avatar of the project | | `printing_merge_request_link_enabled` | boolean | no | Show link to create/view merge request when pushing from the command line | -| `ci_config_file` | boolean | no | The relative path to the CI config file (E.g. my/path or my/path/.gitlab-ci.yml or my/path/my-config.yml) | +| `ci_config_file` | boolean | no | The path to CI config file | ### Edit project @@ -418,7 +418,7 @@ Parameters: | `request_access_enabled` | boolean | no | Allow users to request member access | | `tag_list` | array | no | The list of tags for a project; put array of tags, that should be finally assigned to a project | | `avatar` | mixed | no | Image file for avatar of the project | -| `ci_config_file` | boolean | no | The relative path to the CI config file (E.g. my/path or my/path/.gitlab-ci.yml or my/path/my-config.yml) | +| `ci_config_file` | boolean | no | The path to CI config file | ### Fork project diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md index 702b3453a0e..7274fe816cc 100644 --- a/doc/user/project/pipelines/settings.md +++ b/doc/user/project/pipelines/settings.md @@ -27,7 +27,7 @@ The default value is 60 minutes. Decrease the time limit if you want to impose a hard limit on your jobs' running time or increase it otherwise. In any case, if the job surpasses the threshold, it is marked as failed. -## Custom CI Config File +## Custom CI config file > - [Introduced][ce-12509] in GitLab 9.4. |