diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-02-23 17:39:54 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-02-23 17:39:54 +0000 |
| commit | 53d7491a73f73f9634dbecde8d8c1333bfadadad (patch) | |
| tree | 4808e56b3ba11c860d8d4c892b55dcf8cb560809 /app/views/admin | |
| parent | dda2394f9b7196d1a988b8608fd56f346965e934 (diff) | |
| parent | 3540841b214846deff7cd79baf6cc86aa8653b81 (diff) | |
| download | gitlab-ce-53d7491a73f73f9634dbecde8d8c1333bfadadad.tar.gz | |
Merge branch '29497-pages-custom-domain-dns-verification' into 'master'
Resolve "Domain validation for Pages custom domains" (master branch)
Closes #29497, #42971, and #42083
See merge request gitlab-org/gitlab-ce!17311
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 60f12030f98..20527d31870 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -237,6 +237,17 @@ .col-sm-10 = f.number_field :max_pages_size, class: 'form-control' .help-block 0 for unlimited + .form-group + .col-sm-offset-2.col-sm-10 + .checkbox + = f.label :pages_domain_verification_enabled do + = f.check_box :pages_domain_verification_enabled + Require users to prove ownership of custom domains + .help-block + Domain verification is an essential security measure for public GitLab + sites. Users are required to demonstrate they control a domain before + it is enabled + = link_to icon('question-circle'), help_page_path('user/project/pages/getting_started_part_three.md', anchor: 'dns-txt-record') %fieldset %legend Continuous Integration and Deployment |