diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-06 07:20:36 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-06 07:20:36 +0000 |
| commit | 6afe25ef336aca40b87cede499f8b8f5928129f6 (patch) | |
| tree | 493201a50520e6b9c1f6f861aaeb8859a4b6f19f /app/views/projects/pipelines_settings | |
| parent | 6c15905c3bd11209858eac8870ffa9211f08f157 (diff) | |
| parent | cca9242085d73dff66a946af8a740a4f7419f84c (diff) | |
| download | gitlab-ce-6afe25ef336aca40b87cede499f8b8f5928129f6.tar.gz | |
Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'
Resolve "Project option to allow customizing CI/CD config path"
Closes #32815 and #33130
See merge request !12509
Diffstat (limited to 'app/views/projects/pipelines_settings')
| -rw-r--r-- | app/views/projects/pipelines_settings/_show.html.haml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/views/projects/pipelines_settings/_show.html.haml b/app/views/projects/pipelines_settings/_show.html.haml index 151d794fa92..255d7ef38e0 100644 --- a/app/views/projects/pipelines_settings/_show.html.haml +++ b/app/views/projects/pipelines_settings/_show.html.haml @@ -47,6 +47,14 @@ %hr .form-group + = f.label :ci_config_path, 'Custom CI config path', class: 'label-light' + = f.text_field :ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml' + %p.help-block + The path to CI config file. Defaults to <code>.gitlab-ci.yml</code> + = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'custom-ci-config-path'), target: '_blank' + + %hr + .form-group .checkbox = f.label :public_builds do = f.check_box :public_builds |