summaryrefslogtreecommitdiff
path: root/app/views/groups
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-30 06:08:13 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-30 06:08:13 +0000
commite36d26c6e48724229ddff62fc2d218d06bff8bef (patch)
treed1164d7ec058eef005f50b1ada28695548dd5c84 /app/views/groups
parent340ff214b382575ec5075ca10fdd4e4ade76b8dd (diff)
downloadgitlab-ce-e36d26c6e48724229ddff62fc2d218d06bff8bef.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/edit.html.haml2
-rw-r--r--app/views/groups/settings/_pages_settings.html.haml5
2 files changed, 7 insertions, 0 deletions
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 0e78ce9f656..fe5a00e3be9 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -53,4 +53,6 @@
.settings-content
= render 'groups/settings/advanced'
+= render_if_exists 'shared/groups/max_pages_size_setting'
+
= render 'shared/confirm_modal', phrase: @group.path
diff --git a/app/views/groups/settings/_pages_settings.html.haml b/app/views/groups/settings/_pages_settings.html.haml
new file mode 100644
index 00000000000..9e1932185da
--- /dev/null
+++ b/app/views/groups/settings/_pages_settings.html.haml
@@ -0,0 +1,5 @@
+= form_for @group, html: { multipart: true, class: 'gl-show-field-errors' }, authenticity_token: true do |f|
+ = render_if_exists 'shared/pages/max_pages_size_input', form: f
+
+ .prepend-top-10
+ = f.submit s_('GitLabPages|Save'), class: 'btn btn-success'