Add latest changes from gitlab-org/gitlab@master

3 files changed, 15 insertions, 13 deletions

diff --git a/app/views/projects/pages/_https_only.html.haml b/app/views/projects/pages/_https_only.html.haml
deleted file mode 100644
index d8c4a5f0a5d..00000000000
--- a/app/views/projects/pages/_https_only.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-= form_for @project, url: namespace_project_pages_path(@project.namespace.becomes(Namespace), @project), html: { class: 'inline', title: pages_https_only_title } do |f|
-  .form-group
-    .form-check
-      = f.check_box :pages_https_only, class: 'form-check-input', disabled: pages_https_only_disabled?
-      = f.label :pages_https_only, class: pages_https_only_label_class do
-        %strong
-          = s_('GitLabPages|Force HTTPS (requires valid certificates)')
-
-  - unless pages_https_only_disabled?
-    .prepend-top-10
-    = f.submit s_('GitLabPages|Save'), class: 'btn btn-success'
diff --git a/app/views/projects/pages/_pages_settings.html.haml b/app/views/projects/pages/_pages_settings.html.haml
new file mode 100644
index 00000000000..58eddf630f4
--- /dev/null
+++ b/app/views/projects/pages/_pages_settings.html.haml
@@ -0,0 +1,13 @@
+= form_for @project, url: namespace_project_pages_path(@project.namespace.becomes(Namespace), @project), html: { class: 'inline', title: pages_https_only_title } do |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
+        = f.check_box :pages_https_only, class: 'form-check-input', disabled: pages_https_only_disabled?
+        = f.label :pages_https_only, class: pages_https_only_label_class do
+          %strong
+            = s_('GitLabPages|Force HTTPS (requires valid certificates)')
+
+    .prepend-top-10
+      = f.submit s_('GitLabPages|Save'), class: 'btn btn-success'
diff --git a/app/views/projects/pages/show.html.haml b/app/views/projects/pages/show.html.haml
index 3ec87597849..8dbe67e153a 100644
--- a/app/views/projects/pages/show.html.haml
+++ b/app/views/projects/pages/show.html.haml
@@ -10,8 +10,8 @@
 
   %p.light
     = s_('GitLabPages|With GitLab Pages you can host your static websites on GitLab.  Combined with the power of GitLab CI and the help of GitLab Runner you can deploy static pages for your individual projects, your user or your group.')
-  - if Gitlab.config.pages.external_https
-    = render 'https_only'
+
+  = render 'pages_settings'
 
   %hr.clearfix