Commit 29515da8 authored by Jacques Erasmus's avatar Jacques Erasmus

Merge branch 'dz/358340-migrate-checkboxes-to-pajamas' into 'master'

Migrate checkboxes to Pajamas form

See merge request gitlab-org/gitlab!84757
parents 67fd98b1 9dd7f614
...@@ -650,14 +650,6 @@ module ProjectsHelper ...@@ -650,14 +650,6 @@ module ProjectsHelper
"You must enable HTTPS for all your domains first" "You must enable HTTPS for all your domains first"
end end
def pages_https_only_label_class
if pages_https_only_disabled?
"list-label disabled"
else
"list-label"
end
end
def filter_starrer_path(options = {}) def filter_starrer_path(options = {})
options = params.slice(:sort).merge(options).permit! options = params.slice(:sort).merge(options).permit!
"#{request.path}?#{options.to_param}" "#{request.path}?#{options.to_param}"
......
...@@ -2,21 +2,20 @@ ...@@ -2,21 +2,20 @@
- can_enforce_https_only=Gitlab.config.pages.external_http || Gitlab.config.pages.external_https - can_enforce_https_only=Gitlab.config.pages.external_http || Gitlab.config.pages.external_https
- return unless can_edit_max_page_size || can_enforce_https_only - return unless can_edit_max_page_size || can_enforce_https_only
= form_for @project, url: project_pages_path(@project), html: { class: 'inline', title: pages_https_only_title } do |f| = gitlab_ui_form_for @project, url: project_pages_path(@project), html: { class: 'inline', title: pages_https_only_title } do |f|
- if can_edit_max_page_size - if can_edit_max_page_size
= render_if_exists 'shared/pages/max_pages_size_input', form: f = render_if_exists 'shared/pages/max_pages_size_input', form: f
- if can_enforce_https_only - if can_enforce_https_only
.form-group .form-group
.form-check = f.gitlab_ui_checkbox_component :pages_https_only,
= f.check_box :pages_https_only, class: 'form-check-input', disabled: pages_https_only_disabled? s_('GitLabPages|Force HTTPS (requires valid certificates)'),
= f.label :pages_https_only, class: pages_https_only_label_class do checkbox_options: { disabled: pages_https_only_disabled? },
%strong label_options: { class: 'label-bold' }
= s_('GitLabPages|Force HTTPS (requires valid certificates)') - docs_link_start = "<a href='#{help_page_path('user/project/pages/custom_domains_ssl_tls_certification/index', anchor: 'force-https-for-gitlab-pages-websites')}' target='_blank' rel='noopener noreferrer'>".html_safe
- docs_link_start = "<a href='#{help_page_path('user/project/pages/custom_domains_ssl_tls_certification/index', anchor: 'force-https-for-gitlab-pages-websites')}' target='_blank' rel='noopener noreferrer'>".html_safe - link_end = '</a>'.html_safe
- link_end = '</a>'.html_safe %p.gl-pl-6
%p = s_("GitLabPages|When enabled, all attempts to visit your website through HTTP are automatically redirected to HTTPS using a response with status code 301. Requires a valid certificate for all domains. %{docs_link_start}Learn more.%{link_end}").html_safe % { docs_link_start: docs_link_start, link_end: link_end }
= s_("GitLabPages|When enabled, all attempts to visit your website through HTTP are automatically redirected to HTTPS using a response with status code 301. Requires a valid certificate for all domains. %{docs_link_start}Learn more.%{link_end}").html_safe % { docs_link_start: docs_link_start, link_end: link_end }
.gl-mt-3 .gl-mt-3
= f.submit s_('GitLabPages|Save changes'), class: 'btn btn-confirm gl-button' = f.submit s_('GitLabPages|Save changes'), class: 'btn btn-confirm gl-button'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment