diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 12:08:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 12:08:43 +0300 |
commit | bc12365ae0254332f97299138f019bea3ff12351 (patch) | |
tree | c3a65a5523b0b0455780b17d11e0d7039355baa7 /app/views/projects/pages | |
parent | 99551d44588b9c815df9691c8e619eb8beaa0045 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/pages')
-rw-r--r-- | app/views/projects/pages/_pages_settings.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/pages/_pages_settings.html.haml b/app/views/projects/pages/_pages_settings.html.haml index 8aa02074205..51483176d6f 100644 --- a/app/views/projects/pages/_pages_settings.html.haml +++ b/app/views/projects/pages/_pages_settings.html.haml @@ -1,6 +1,7 @@ = form_for @project, url: project_pages_path(@project), html: { class: 'inline', title: pages_https_only_title } do |f| + = render_if_exists 'shared/pages/max_pages_size_input', form: f + - if Gitlab.config.pages.external_http || Gitlab.config.pages.external_https - = render_if_exists 'shared/pages/max_pages_size_input', form: f .form-group .form-check @@ -9,5 +10,5 @@ %strong = s_('GitLabPages|Force HTTPS (requires valid certificates)') - .gl-mt-3 - = f.submit s_('GitLabPages|Save'), class: 'btn btn-success' + .gl-mt-3 + = f.submit s_('GitLabPages|Save'), class: 'btn btn-success gl-button' |