diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-07 15:41:32 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-07 15:41:32 +0300 |
| commit | d08bf247bc2a99120498e939ba573f44e5f27f07 (patch) | |
| tree | 6fe348f4ffdc1b104374743a8e4a19621188e895 /app/views | |
| parent | 2b5d5b107ccc852f498d226d05d276160fc30c5a (diff) | |
| parent | 5291c0bb51ae19109e09ff0ee7fca6f118288923 (diff) | |
Merge branch '38175-add-domain-field-to-auto-devops-application-setting' into 'master'
Resolve "Add domain field to Auto DevOps application setting"
Closes #38175
See merge request gitlab-org/gitlab-ce!16604
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index fb5e6f337a7..60f12030f98 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -249,7 +249,12 @@ .help-block It will automatically build, test, and deploy applications based on a predefined CI/CD configuration = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md') - + .form-group + = f.label :auto_devops_domain, class: 'control-label col-sm-2' + .col-sm-10 + = f.text_field :auto_devops_domain, class: 'form-control', placeholder: 'domain.com' + .help-block + = s_("AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages.") .form-group .col-sm-offset-2.col-sm-10 .checkbox |