diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-08-24 13:01:33 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-08-31 22:25:25 +0200 |
| commit | 6ed490401f49a8941dc7a9e3757ec4012f14ef0b (patch) | |
| tree | 058ba4c324208c486d2a8bd7326bcf0e292b32a7 /app/views/admin/application_settings/_form.html.haml | |
| parent | e58428382265f02639a7fc8c1bfcc6311564c0d0 (diff) | |
| download | gitlab-ce-6ed490401f49a8941dc7a9e3757ec4012f14ef0b.tar.gz | |
Implement the implied CI/CD config for AutoDevOps
Behind an application setting, which defaults to false, this commit
implements the implied CI/CD config. Which means that in the case we
can't find the `.gitlab-ci.yml` on the commit we want to start a
pipeline for, we fall back to an implied configuration.
For now the Bash template has been copied to
`Auto-Devops.gitlab-ci.yml` so the tests actually work.
Fixes #34777
Diffstat (limited to 'app/views/admin/application_settings/_form.html.haml')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 734a08c61fa..a487f2b6995 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -217,7 +217,13 @@ .help-block 0 for unlimited %fieldset - %legend Continuous Integration + %legend Continuous Integration and Continuous Deployment + .form-group + .col-sm-offset-2.col-sm-10 + .checkbox + = f.label :auto_devops_enabled do + = f.check_box :auto_devops_enabled + Allow projects to get automaticly configured to use GitLab CI/CD. .form-group .col-sm-offset-2.col-sm-10 .checkbox |