Commit 7e83211f authored by Annabel Gray's avatar Annabel Gray

Merge branch 'bootstrap-checkbox' into 'master'

Fix checkbox/radio button structure

Closes #46766 and #46719

See merge request gitlab-org/gitlab-ce!19254
parents e57ad62d 1a6d848d
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :gravatar_enabled do = f.check_box :gravatar_enabled, class: 'form-check-input'
= f.check_box :gravatar_enabled = f.label :gravatar_enabled, class: 'form-check-label' do
Gravatar enabled Gravatar enabled
.form-group.row .form-group.row
= f.label :default_projects_limit, class: 'col-form-label col-sm-2' = f.label :default_projects_limit, class: 'col-form-label col-sm-2'
...@@ -25,15 +25,15 @@ ...@@ -25,15 +25,15 @@
= f.label :user_oauth_applications, 'User OAuth applications', class: 'col-form-label col-sm-2' = f.label :user_oauth_applications, 'User OAuth applications', class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.label :user_oauth_applications do = f.check_box :user_oauth_applications, class: 'form-check-input'
= f.check_box :user_oauth_applications = f.label :user_oauth_applications, class: 'form-check-label' do
Allow users to register any application to use GitLab as an OAuth provider Allow users to register any application to use GitLab as an OAuth provider
.form-group.row .form-group.row
= f.label :user_default_external, 'New users set to external', class: 'col-form-label col-sm-2' = f.label :user_default_external, 'New users set to external', class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.label :user_default_external do = f.check_box :user_default_external, class: 'form-check-input'
= f.check_box :user_default_external = f.label :user_default_external, class: 'form-check-label' do
Newly registered users will by default be external Newly registered users will by default be external
= f.submit 'Save changes', class: 'btn btn-success' = f.submit 'Save changes', class: 'btn btn-success'
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :sidekiq_throttling_enabled do = f.check_box :sidekiq_throttling_enabled, class: 'form-check-input'
= f.check_box :sidekiq_throttling_enabled = f.label :sidekiq_throttling_enabled, class: 'form-check-label' do
Enable Sidekiq Job Throttling Enable Sidekiq Job Throttling
.form-text.text-muted .form-text.text-muted
Limit the amount of resources slow running jobs are assigned. Limit the amount of resources slow running jobs are assigned.
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :auto_devops_enabled do = f.check_box :auto_devops_enabled, class: 'form-check-input'
= f.check_box :auto_devops_enabled = f.label :auto_devops_enabled, class: 'form-check-label' do
Enabled Auto DevOps for projects by default Enabled Auto DevOps for projects by default
.form-text.text-muted .form-text.text-muted
It will automatically build, test, and deploy applications based on a predefined CI/CD configuration It will automatically build, test, and deploy applications based on a predefined CI/CD configuration
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :shared_runners_enabled do = f.check_box :shared_runners_enabled, class: 'form-check-input'
= f.check_box :shared_runners_enabled = f.label :shared_runners_enabled, class: 'form-check-label' do
Enable shared runners for new projects Enable shared runners for new projects
.form-group.row .form-group.row
= f.label :shared_runners_text, class: 'col-form-label col-sm-2' = f.label :shared_runners_text, class: 'col-form-label col-sm-2'
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :email_author_in_body do = f.check_box :email_author_in_body, class: 'form-check-input'
= f.check_box :email_author_in_body = f.label :email_author_in_body, class: 'form-check-label' do
Include author name in notification email body Include author name in notification email body
.form-text.text-muted .form-text.text-muted
Some email servers do not support overriding the email sender name. Some email servers do not support overriding the email sender name.
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :html_emails_enabled do = f.check_box :html_emails_enabled, class: 'form-check-input'
= f.check_box :html_emails_enabled = f.label :html_emails_enabled, class: 'form-check-label' do
Enable HTML emails Enable HTML emails
.form-text.text-muted .form-text.text-muted
By default GitLab sends emails in HTML and plain text formats so mail By default GitLab sends emails in HTML and plain text formats so mail
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :help_page_hide_commercial_content do = f.check_box :help_page_hide_commercial_content, class: 'form-check-input'
= f.check_box :help_page_hide_commercial_content = f.label :help_page_hide_commercial_content, class: 'form-check-label' do
Hide marketing-related entries from help Hide marketing-related entries from help
.form-group.row .form-group.row
= f.label :help_page_support_url, 'Support page URL', class: 'col-form-label col-sm-2' = f.label :help_page_support_url, 'Support page URL', class: 'col-form-label col-sm-2'
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :metrics_enabled do = f.check_box :metrics_enabled, class: 'form-check-input'
= f.check_box :metrics_enabled = f.label :metrics_enabled, class: 'form-check-label' do
Enable InfluxDB Metrics Enable InfluxDB Metrics
.form-group.row .form-group.row
= f.label :metrics_host, 'InfluxDB host', class: 'col-form-label col-sm-2' = f.label :metrics_host, 'InfluxDB host', class: 'col-form-label col-sm-2'
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :throttle_unauthenticated_enabled do = f.check_box :throttle_unauthenticated_enabled, class: 'form-check-input'
= f.check_box :throttle_unauthenticated_enabled = f.label :throttle_unauthenticated_enabled, class: 'form-check-label' do
Enable unauthenticated request rate limit Enable unauthenticated request rate limit
%span.form-text.text-muted %span.form-text.text-muted
Helps reduce request volume (e.g. from crawlers or abusive bots) Helps reduce request volume (e.g. from crawlers or abusive bots)
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :throttle_authenticated_api_enabled do = f.check_box :throttle_authenticated_api_enabled, class: 'form-check-input'
= f.check_box :throttle_authenticated_api_enabled = f.label :throttle_authenticated_api_enabled, class: 'form-check-label' do
Enable authenticated API request rate limit Enable authenticated API request rate limit
%span.form-text.text-muted %span.form-text.text-muted
Helps reduce request volume (e.g. from crawlers or abusive bots) Helps reduce request volume (e.g. from crawlers or abusive bots)
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :throttle_authenticated_web_enabled do = f.check_box :throttle_authenticated_web_enabled, class: 'form-check-input'
= f.check_box :throttle_authenticated_web_enabled = f.label :throttle_authenticated_web_enabled, class: 'form-check-label' do
Enable authenticated web request rate limit Enable authenticated web request rate limit
%span.form-text.text-muted %span.form-text.text-muted
Helps reduce request volume (e.g. from crawlers or abusive bots) Helps reduce request volume (e.g. from crawlers or abusive bots)
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :koding_enabled do = f.check_box :koding_enabled, class: 'form-check-input'
= f.check_box :koding_enabled = f.label :koding_enabled, class: 'form-check-label' do
Enable Koding Enable Koding
.form-text.text-muted .form-text.text-muted
Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again. Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again.
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :sentry_enabled do = f.check_box :sentry_enabled, class: 'form-check-input'
= f.check_box :sentry_enabled = f.label :sentry_enabled, class: 'form-check-label' do
Enable Sentry Enable Sentry
.form-text.text-muted .form-text.text-muted
%p This setting requires a restart to take effect. %p This setting requires a restart to take effect.
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :clientside_sentry_enabled do = f.check_box :clientside_sentry_enabled, class: 'form-check-input'
= f.check_box :clientside_sentry_enabled = f.label :clientside_sentry_enabled, class: 'form-check-label' do
Enable Clientside Sentry Enable Clientside Sentry
.form-text.text-muted .form-text.text-muted
Sentry can also be used for reporting and logging clientside exceptions. Sentry can also be used for reporting and logging clientside exceptions.
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :allow_local_requests_from_hooks_and_services do = f.check_box :allow_local_requests_from_hooks_and_services, class: 'form-check-input'
= f.check_box :allow_local_requests_from_hooks_and_services = f.label :allow_local_requests_from_hooks_and_services, class: 'form-check-label' do
Allow requests to the local network from hooks and services Allow requests to the local network from hooks and services
= f.submit 'Save changes', class: "btn btn-success" = f.submit 'Save changes', class: "btn btn-success"
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :pages_domain_verification_enabled do = f.check_box :pages_domain_verification_enabled, class: 'form-check-input'
= f.check_box :pages_domain_verification_enabled = f.label :pages_domain_verification_enabled, class: 'form-check-label' do
Require users to prove ownership of custom domains Require users to prove ownership of custom domains
.form-text.text-muted .form-text.text-muted
Domain verification is an essential security measure for public GitLab Domain verification is an essential security measure for public GitLab
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :authorized_keys_enabled do = f.check_box :authorized_keys_enabled, class: 'form-check-input'
= f.check_box :authorized_keys_enabled = f.label :authorized_keys_enabled, class: 'form-check-label' do
Write to "authorized_keys" file Write to "authorized_keys" file
.form-text.text-muted .form-text.text-muted
By default, we write to the "authorized_keys" file to support Git By default, we write to the "authorized_keys" file to support Git
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :performance_bar_enabled do = f.check_box :performance_bar_enabled, class: 'form-check-input'
= f.check_box :performance_bar_enabled = f.label :performance_bar_enabled, class: 'form-check-label' do
Enable the Performance Bar Enable the Performance Bar
.form-group.row .form-group.row
= f.label :performance_bar_allowed_group_path, 'Allowed group', class: 'col-form-label col-sm-2' = f.label :performance_bar_allowed_group_path, 'Allowed group', class: 'col-form-label col-sm-2'
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :plantuml_enabled do = f.check_box :plantuml_enabled, class: 'form-check-input'
= f.check_box :plantuml_enabled = f.label :plantuml_enabled, class: 'form-check-label' do
Enable PlantUML Enable PlantUML
.form-group.row .form-group.row
= f.label :plantuml_url, 'PlantUML URL', class: 'col-form-label col-sm-2' = f.label :plantuml_url, 'PlantUML URL', class: 'col-form-label col-sm-2'
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :prometheus_metrics_enabled do = f.check_box :prometheus_metrics_enabled, class: 'form-check-input'
= f.check_box :prometheus_metrics_enabled = f.label :prometheus_metrics_enabled, class: 'form-check-label' do
Enable Prometheus Metrics Enable Prometheus Metrics
- unless Gitlab::Metrics.metrics_folder_present? - unless Gitlab::Metrics.metrics_folder_present?
.form-text.text-muted .form-text.text-muted
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :repository_checks_enabled do = f.check_box :repository_checks_enabled, class: 'form-check-input'
= f.check_box :repository_checks_enabled = f.label :repository_checks_enabled, class: 'form-check-label' do
Enable Repository Checks Enable Repository Checks
.form-text.text-muted .form-text.text-muted
GitLab will periodically run GitLab will periodically run
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :housekeeping_enabled do = f.check_box :housekeeping_enabled, class: 'form-check-input'
= f.check_box :housekeeping_enabled = f.label :housekeeping_enabled, class: 'form-check-label' do
Enable automatic repository housekeeping (git repack, git gc) Enable automatic repository housekeeping (git repack, git gc)
.form-text.text-muted .form-text.text-muted
If you keep automatic housekeeping disabled for a long time Git If you keep automatic housekeeping disabled for a long time Git
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
repositories will use more disk space. We recommend to always leave repositories will use more disk space. We recommend to always leave
this enabled. this enabled.
.form-check .form-check
= f.label :housekeeping_bitmaps_enabled do = f.check_box :housekeeping_bitmaps_enabled, class: 'form-check-input'
= f.check_box :housekeeping_bitmaps_enabled = f.label :housekeeping_bitmaps_enabled, class: 'form-check-label' do
Enable Git pack file bitmap creation Enable Git pack file bitmap creation
.form-text.text-muted .form-text.text-muted
Creating pack file bitmaps makes housekeeping take a little longer but Creating pack file bitmaps makes housekeeping take a little longer but
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
= f.label :mirror_available, 'Enable mirror configuration', class: 'control-label col-sm-2' = f.label :mirror_available, 'Enable mirror configuration', class: 'control-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.label :mirror_available do = f.check_box :mirror_available, class: 'form-check-input'
= f.check_box :mirror_available = f.label :mirror_available, class: 'form-check-label' do
Allow mirrors to be setup for projects Allow mirrors to be setup for projects
%span.form-text.text-muted %span.form-text.text-muted
If disabled, only admins will be able to setup mirrors in projects. If disabled, only admins will be able to setup mirrors in projects.
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :hashed_storage_enabled do = f.check_box :hashed_storage_enabled, class: 'form-check-input'
= f.check_box :hashed_storage_enabled = f.label :hashed_storage_enabled, class: 'form-check-label' do
Create new projects using hashed storage paths Create new projects using hashed storage paths
.form-text.text-muted .form-text.text-muted
Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents
......
...@@ -5,16 +5,16 @@ ...@@ -5,16 +5,16 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :password_authentication_enabled_for_web do = f.check_box :password_authentication_enabled_for_web, class: 'form-check-input'
= f.check_box :password_authentication_enabled_for_web = f.label :password_authentication_enabled_for_web, class: 'form-check-label' do
Password authentication enabled for web interface Password authentication enabled for web interface
.form-text.text-muted .form-text.text-muted
When disabled, an external authentication provider must be used. When disabled, an external authentication provider must be used.
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :password_authentication_enabled_for_git do = f.check_box :password_authentication_enabled_for_git, class: 'form-check-input'
= f.check_box :password_authentication_enabled_for_git = f.label :password_authentication_enabled_for_git, class: 'form-check-label' do
Password authentication enabled for Git over HTTP(S) Password authentication enabled for Git over HTTP(S)
.form-text.text-muted .form-text.text-muted
When disabled, a Personal Access Token When disabled, a Personal Access Token
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
= f.label :two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2' = f.label :two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.label :require_two_factor_authentication do = f.check_box :require_two_factor_authentication, class: 'form-check-input'
= f.check_box :require_two_factor_authentication = f.label :require_two_factor_authentication, class: 'form-check-label' do
Require all users to setup Two-factor authentication Require all users to setup Two-factor authentication
.form-group.row .form-group.row
= f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'col-form-label col-sm-2' = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'col-form-label col-sm-2'
......
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :signup_enabled do = f.check_box :signup_enabled, class: 'form-check-input'
= f.check_box :signup_enabled = f.label :signup_enabled, class: 'form-check-label' do
Sign-up enabled Sign-up enabled
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :send_user_confirmation_email do = f.check_box :send_user_confirmation_email, class: 'form-check-input'
= f.check_box :send_user_confirmation_email = f.label :send_user_confirmation_email, class: 'form-check-label' do
Send confirmation email on sign-up Send confirmation email on sign-up
.form-group.row .form-group.row
= f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'col-form-label col-sm-2' = f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'col-form-label col-sm-2'
...@@ -23,19 +23,19 @@ ...@@ -23,19 +23,19 @@
= f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'col-form-label col-sm-2' = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.label :domain_blacklist_enabled do = f.check_box :domain_blacklist_enabled, class: 'form-check-input'
= f.check_box :domain_blacklist_enabled = f.label :domain_blacklist_enabled, class: 'form-check-label' do
Enable domain blacklist for sign ups Enable domain blacklist for sign ups
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= label_tag :blacklist_type_file do = radio_button_tag :blacklist_type, :file, class: 'form-check-input'
= radio_button_tag :blacklist_type, :file = label_tag :blacklist_type_file, class: 'form-check-label' do
.option-title .option-title
Upload blacklist file Upload blacklist file
.form-check .form-check
= label_tag :blacklist_type_raw do = radio_button_tag :blacklist_type, :raw, @application_setting.domain_blacklist.present? || @application_setting.domain_blacklist.blank?, class: 'form-check-input'
= radio_button_tag :blacklist_type, :raw, @application_setting.domain_blacklist.present? || @application_setting.domain_blacklist.blank? = label_tag :blacklist_type_raw, class: 'form-check-label' do
.option-title .option-title
Enter blacklist manually Enter blacklist manually
.form-group.row.blacklist-file .form-group.row.blacklist-file
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :recaptcha_enabled do = f.check_box :recaptcha_enabled, class: 'form-check-input'
= f.check_box :recaptcha_enabled = f.label :recaptcha_enabled, class: 'form-check-label' do
Enable reCAPTCHA Enable reCAPTCHA
%span.form-text.text-muted#recaptcha_help_block Helps prevent bots from creating accounts %span.form-text.text-muted#recaptcha_help_block Helps prevent bots from creating accounts
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :akismet_enabled do = f.check_box :akismet_enabled, class: 'form-check-input'
= f.check_box :akismet_enabled = f.label :akismet_enabled, class: 'form-check-label' do
Enable Akismet Enable Akismet
%span.form-text.text-muted#akismet_help_block Helps prevent bots from creating issues %span.form-text.text-muted#akismet_help_block Helps prevent bots from creating issues
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :unique_ips_limit_enabled do = f.check_box :unique_ips_limit_enabled, class: 'form-check-input'
= f.check_box :unique_ips_limit_enabled = f.label :unique_ips_limit_enabled, class: 'form-check-label' do
Limit sign in from multiple ips Limit sign in from multiple ips
%span.form-text.text-muted#unique_ip_help_block %span.form-text.text-muted#unique_ip_help_block
Helps prevent malicious users hide their activity Helps prevent malicious users hide their activity
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.form-group .form-group
.col-sm-12 .col-sm-12
.form-check .form-check
= f.label :enforce_terms do = f.check_box :enforce_terms, class: 'form-check-input'
= f.check_box :enforce_terms = f.label :enforce_terms, class: 'form-check-label' do
= _("Require all users to accept Terms of Service when they access GitLab.") = _("Require all users to accept Terms of Service when they access GitLab.")
.form-text.text-muted .form-text.text-muted
= _("When enabled, users cannot use GitLab until the terms have been accepted.") = _("When enabled, users cannot use GitLab until the terms have been accepted.")
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :version_check_enabled do = f.check_box :version_check_enabled, class: 'form-check-input'
= f.check_box :version_check_enabled = f.label :version_check_enabled, class: 'form-check-label' do
Enable version check Enable version check
.form-text.text-muted .form-text.text-muted
GitLab will inform you if a new version is available. GitLab will inform you if a new version is available.
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
- can_be_configured = @application_setting.usage_ping_can_be_configured? - can_be_configured = @application_setting.usage_ping_can_be_configured?
.form-check .form-check
= f.label :usage_ping_enabled do = f.check_box :usage_ping_enabled, disabled: !can_be_configured, class: 'form-check-input'
= f.check_box :usage_ping_enabled, disabled: !can_be_configured = f.label :usage_ping_enabled, class: 'form-check-label' do
Enable usage ping Enable usage ping
.form-text.text-muted .form-text.text-muted
- if can_be_configured - if can_be_configured
......
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= f.label :project_export_enabled do = f.check_box :project_export_enabled, class: 'form-check-input'
= f.check_box :project_export_enabled = f.label :project_export_enabled, class: 'form-check-label' do
Project export enabled Project export enabled
.form-group.row .form-group.row
......
...@@ -47,6 +47,6 @@ ...@@ -47,6 +47,6 @@
.form-group .form-group
= form.label :enable_ssl_verification, 'SSL verification', class: 'label-light checkbox' = form.label :enable_ssl_verification, 'SSL verification', class: 'label-light checkbox'
.form-check .form-check
= form.label :enable_ssl_verification do = form.check_box :enable_ssl_verification, class: 'form-check-input'
= form.check_box :enable_ssl_verification = form.label :enable_ssl_verification, class: 'form-check-label' do
%strong Enable SSL verification %strong Enable SSL verification
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
Mattermost Mattermost
.col-sm-10 .col-sm-10
.form-check.js-toggle-container .form-check.js-toggle-container
= f.label :create_chat_team do .js-toggle-button.form-check-input= f.check_box(:create_chat_team, { checked: true }, true, false)
.js-toggle-button= f.check_box(:create_chat_team, { checked: true }, true, false) = f.label :create_chat_team, class: 'form-check-label' do
Create a Mattermost team for this group Create a Mattermost team for this group
%br %br
%small.light.js-toggle-content %small.light.js-toggle-content
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
= f.label :lfs_enabled, 'Large File Storage', class: 'col-form-label col-sm-2' = f.label :lfs_enabled, 'Large File Storage', class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.label :lfs_enabled do = f.check_box :lfs_enabled, checked: @group.lfs_enabled?, class: 'form-check-input'
= f.check_box :lfs_enabled, checked: @group.lfs_enabled? = f.label :lfs_enabled, class: 'form-check-label' do
%strong %strong
Allow projects within this group to use Git LFS Allow projects within this group to use Git LFS
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs') = link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
= f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2' = f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.label :require_two_factor_authentication do = f.check_box :require_two_factor_authentication, class: 'form-check-input'
= f.check_box :require_two_factor_authentication = f.label :require_two_factor_authentication, class: 'form-check-label' do
%strong %strong
Require all users in this group to setup Two-factor authentication Require all users in this group to setup Two-factor authentication
= link_to icon('question-circle'), help_page_path('security/two_factor_authentication', anchor: 'enforcing-2fa-for-all-users-in-a-group') = link_to icon('question-circle'), help_page_path('security/two_factor_authentication', anchor: 'enforcing-2fa-for-all-users-in-a-group')
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
= s_('GroupSettings|Share with group lock') = s_('GroupSettings|Share with group lock')
.col-sm-10 .col-sm-10
.form-check .form-check
= f.label :share_with_group_lock do = f.check_box :share_with_group_lock, disabled: !can_change_share_with_group_lock?(@group), class: 'form-check-input'
= f.check_box :share_with_group_lock, disabled: !can_change_share_with_group_lock?(@group) = f.label :share_with_group_lock, class: 'form-check-label' do
%strong %strong
- group_link = link_to @group.name, group_path(@group) - group_link = link_to @group.name, group_path(@group)
= s_('GroupSettings|Prevent sharing a project within %{group} with other groups').html_safe % { group: group_link } = s_('GroupSettings|Prevent sharing a project within %{group} with other groups').html_safe % { group: group_link }
......
...@@ -472,8 +472,8 @@ ...@@ -472,8 +472,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
%label %input.form-check-input{ :type => "checkbox" }/
%input{ :type => "checkbox" }/ %label.form-check-label
Remember me Remember me
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
...@@ -492,8 +492,8 @@ ...@@ -492,8 +492,8 @@
%label{ :for => "exampleInputPassword1" } Password %label{ :for => "exampleInputPassword1" } Password
%input#exampleInputPassword1.form-control{ :placeholder => "Password", :type => "password" }/ %input#exampleInputPassword1.form-control{ :placeholder => "Password", :type => "password" }/
.form-check .form-check
%label %input.form-check-input{ :type => "checkbox" }/
%input{ :type => "checkbox" }/ %label.form-check-label
Remember me Remember me
%button.btn.btn-default{ :type => "submit" } Sign in %button.btn.btn-default{ :type => "submit" } Sign in
......
...@@ -5,16 +5,16 @@ ...@@ -5,16 +5,16 @@
= label_tag :merge_method_merge, class: 'label-light' do = label_tag :merge_method_merge, class: 'label-light' do
Merge method Merge method
.form-check .form-check
= label_tag :project_merge_method_merge do = form.radio_button :merge_method, :merge, class: "js-merge-method-radio form-check-input"
= form.radio_button :merge_method, :merge, class: "js-merge-method-radio" = label_tag :project_merge_method_merge, class: 'form-check-label' do
%strong Merge commit %strong Merge commit
%br %br
%span.descr %span.descr
A merge commit is created for every merge, and merging is allowed as long as there are no conflicts. A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.
.form-check .form-check
= label_tag :project_merge_method_rebase_merge do = form.radio_button :merge_method, :rebase_merge, class: "js-merge-method-radio form-check-input"
= form.radio_button :merge_method, :rebase_merge, class: "js-merge-method-radio" = label_tag :project_merge_method_rebase_merge, class: 'form-check-label' do
%strong Merge commit with semi-linear history %strong Merge commit with semi-linear history
%br %br
%span.descr %span.descr
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
When fast-forward merge is not possible, the user is given the option to rebase. When fast-forward merge is not possible, the user is given the option to rebase.
.form-check .form-check
= label_tag :project_merge_method_ff do = form.radio_button :merge_method, :ff, class: "js-merge-method-radio qa-radio-button-merge-ff form-check-input"
= form.radio_button :merge_method, :ff, class: "js-merge-method-radio qa-radio-button-merge-ff" = label_tag :project_merge_method_ff, class: 'form-check-label' do
%strong Fast-forward merge %strong Fast-forward merge
%br %br
%span.descr %span.descr
......
...@@ -2,22 +2,22 @@ ...@@ -2,22 +2,22 @@
.form-group .form-group
.form-check.builds-feature{ class: ("hidden" if @project && @project.project_feature.send(:builds_access_level) == 0) } .form-check.builds-feature{ class: ("hidden" if @project && @project.project_feature.send(:builds_access_level) == 0) }
= form.label :only_allow_merge_if_pipeline_succeeds do = form.check_box :only_allow_merge_if_pipeline_succeeds, class: 'form-check-input'
= form.check_box :only_allow_merge_if_pipeline_succeeds = form.label :only_allow_merge_if_pipeline_succeeds, class: 'form-check-label' do
%strong Only allow merge requests to be merged if the pipeline succeeds %strong Only allow merge requests to be merged if the pipeline succeeds
%br %br
%span.descr %span.descr
Pipelines need to be configured to enable this feature. Pipelines need to be configured to enable this feature.
= link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_pipeline_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds'), target: '_blank' = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_pipeline_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds'), target: '_blank'
.form-check .form-check
= form.label :only_allow_merge_if_all_discussions_are_resolved do = form.check_box :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-input'
= form.check_box :only_allow_merge_if_all_discussions_are_resolved = form.label :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-label' do
%strong Only allow merge requests to be merged if all discussions are resolved %strong Only allow merge requests to be merged if all discussions are resolved
.form-check .form-check
= form.label :resolve_outdated_diff_discussions do = form.check_box :resolve_outdated_diff_discussions, class: 'form-check-input'
= form.check_box :resolve_outdated_diff_discussions = form.label :resolve_outdated_diff_discussions, class: 'form-check-label' do
%strong Automatically resolve merge request diff discussions when they become outdated %strong Automatically resolve merge request diff discussions when they become outdated
.form-check .form-check
= form.label :printing_merge_request_link_enabled do = form.check_box :printing_merge_request_link_enabled, class: 'form-check-input'
= form.check_box :printing_merge_request_link_enabled = form.label :printing_merge_request_link_enabled, class: 'form-check-label' do
%strong Show link to create/view merge request when pushing from the command line %strong Show link to create/view merge request when pushing from the command line
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
= icon('search') = icon('search')
.inline.prepend-left-20 .inline.prepend-left-20
.form-check.light .form-check.light
= label_tag :filter_ref do = check_box_tag :filter_ref, 1, @options[:filter_ref], class: 'form-check-input'
= check_box_tag :filter_ref, 1, @options[:filter_ref] = label_tag :filter_ref, class: 'form-check-label' do
%span= _("Begin with the selected commit") %span= _("Begin with the selected commit")
- if @commit - if @commit
......
...@@ -11,22 +11,22 @@ ...@@ -11,22 +11,22 @@
= message.html_safe = message.html_safe
= f.fields_for :auto_devops_attributes, @auto_devops do |form| = f.fields_for :auto_devops_attributes, @auto_devops do |form|
.form-check .form-check
= form.label :enabled_true do = form.radio_button :enabled, 'true', class: 'form-check-input'
= form.radio_button :enabled, 'true' = form.label :enabled_true, class: 'form-check-label' do
%strong= s_('CICD|Enable Auto DevOps') %strong= s_('CICD|Enable Auto DevOps')
%br %br
= s_('CICD|The Auto DevOps pipeline configuration will be used when there is no %{ci_file} in the project.').html_safe % { ci_file: ci_file_formatted } = s_('CICD|The Auto DevOps pipeline configuration will be used when there is no %{ci_file} in the project.').html_safe % { ci_file: ci_file_formatted }
.form-check .form-check
= form.label :enabled_false do = form.radio_button :enabled, 'false', class: 'form-check-input'
= form.radio_button :enabled, 'false' = form.label :enabled_false, class: 'form-check-label' do
%strong= s_('CICD|Disable Auto DevOps') %strong= s_('CICD|Disable Auto DevOps')
%br %br
= s_('CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery.').html_safe % { ci_file: ci_file_formatted } = s_('CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery.').html_safe % { ci_file: ci_file_formatted }
.form-check .form-check
= form.label :enabled_ do = form.radio_button :enabled, '', class: 'form-check-input'
= form.radio_button :enabled, '' = form.label :enabled_, class: 'form-check-label' do
%strong= s_('CICD|Instance default (%{state})') % { state: "#{Gitlab::CurrentSettings.auto_devops_enabled? ? _('enabled') : _('disabled')}" } %strong= s_('CICD|Instance default (%{state})') % { state: "#{Gitlab::CurrentSettings.auto_devops_enabled? ? _('enabled') : _('disabled')}" }
%br %br
= s_('CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}.').html_safe % { ci_file: ci_file_formatted } = s_('CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}.').html_safe % { ci_file: ci_file_formatted }
......
...@@ -20,15 +20,15 @@ ...@@ -20,15 +20,15 @@
Choose between <code>clone</code> or <code>fetch</code> to get the recent application code Choose between <code>clone</code> or <code>fetch</code> to get the recent application code
= link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'git-strategy'), target: '_blank' = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'git-strategy'), target: '_blank'
.form-check .form-check
= f.label :build_allow_git_fetch_false do = f.radio_button :build_allow_git_fetch, 'false', { class: 'form-check-input' }
= f.radio_button :build_allow_git_fetch, 'false' = f.label :build_allow_git_fetch_false, class: 'form-check-label' do
%strong git clone %strong git clone
%br %br
%span.descr %span.descr
Slower but makes sure the project workspace is pristine as it clones the repository from scratch for every job Slower but makes sure the project workspace is pristine as it clones the repository from scratch for every job
.form-check .form-check
= f.label :build_allow_git_fetch_true do = f.radio_button :build_allow_git_fetch, 'true', { class: 'form-check-input' }
= f.radio_button :build_allow_git_fetch, 'true' = f.label :build_allow_git_fetch_true, class: 'form-check-label' do
%strong git fetch %strong git fetch
%br %br
%span.descr %span.descr
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
%hr %hr
.form-group .form-group
.form-check .form-check
= f.label :public_builds do = f.check_box :public_builds, { class: 'form-check-input' }
= f.check_box :public_builds = f.label :public_builds, class: 'form-check-label' do
%strong Public pipelines %strong Public pipelines
.form-text.text-muted .form-text.text-muted
Allow public access to pipelines and job details, including output logs and artifacts Allow public access to pipelines and job details, including output logs and artifacts
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
%hr %hr
.form-group .form-group
.form-check .form-check
= f.label :auto_cancel_pending_pipelines do = f.check_box :auto_cancel_pending_pipelines, { class: 'form-check-input' }, 'enabled', 'disabled'
= f.check_box :auto_cancel_pending_pipelines, {}, 'enabled', 'disabled' = f.label :auto_cancel_pending_pipelines, class: 'form-check-label' do
%strong Auto-cancel redundant, pending pipelines %strong Auto-cancel redundant, pending pipelines
.form-text.text-muted .form-text.text-muted
New pipelines will cancel older, pending pipelines on the same branch New pipelines will cancel older, pending pipelines on the same branch
......
.form-check .form-check
= form.label :request_access_enabled do = form.check_box :request_access_enabled, class: 'form-check-input'
= form.check_box :request_access_enabled = form.label :request_access_enabled, class: 'form-check-label' do
%strong Allow users to request access %strong Allow users to request access
%br %br
%span.descr Allow users to request access if visibility is public or internal. %span.descr Allow users to request access if visibility is public or internal.
.form-check .form-check
- nonce = SecureRandom.hex - nonce = SecureRandom.hex
= label_tag "create_merge_request-#{nonce}" do = check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request form-check-input', id: "create_merge_request-#{nonce}"
= check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request', id: "create_merge_request-#{nonce}" = label_tag "create_merge_request-#{nonce}", class: 'form-check-label' do
- translation_variables = { new_merge_request: "<strong>#{_('new merge request')}</strong>" } - translation_variables = { new_merge_request: "<strong>#{_('new merge request')}</strong>" }
- translation = _('Start a %{new_merge_request} with these changes') % translation_variables - translation = _('Start a %{new_merge_request} with these changes') % translation_variables
#{ translation.html_safe } #{ translation.html_safe }
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
- disallowed = disallowed_visibility_level?(form_model, level) - disallowed = disallowed_visibility_level?(form_model, level)
- restricted = restricted_visibility_levels.include?(level) - restricted = restricted_visibility_levels.include?(level)
- disabled = disallowed || restricted - disabled = disallowed || restricted
.form-check.pl-0{ class: [('disabled' if disabled), ('restricted' if restricted)] } .form-check{ class: [('disabled' if disabled), ('restricted' if restricted)] }
= form.label "#{model_method}_#{level}" do = form.radio_button model_method, level, checked: (selected_level == level), disabled: disabled, class: 'form-check-input'
= form.radio_button model_method, level, checked: (selected_level == level), disabled: disabled = form.label "#{model_method}_#{level}", class: 'form-check-label' do
= visibility_level_icon(level) = visibility_level_icon(level)
.option-title .option-title
= visibility_level_label(level) = visibility_level_label(level)
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
.form-check .form-check
= form.label :confidential do = form.check_box :confidential, class: 'form-check-input'
= form.check_box :confidential = form.label :confidential, class: 'form-check-label' do
This issue is confidential and should only be visible to team members with at least Reporter access. This issue is confidential and should only be visible to team members with at least Reporter access.
= render 'shared/issuable/form/metadata', issuable: issuable, form: form = render 'shared/issuable/form/metadata', issuable: issuable, form: form
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
= _('Contribution') = _('Contribution')
.col-sm-10 .col-sm-10
.form-check .form-check
= form.label :allow_maintainer_to_push do = form.check_box :allow_maintainer_to_push, disabled: !issuable.can_allow_maintainer_to_push?(current_user), class: 'form-check-input'
= form.check_box :allow_maintainer_to_push, disabled: !issuable.can_allow_maintainer_to_push?(current_user) = form.label :allow_maintainer_to_push, class: 'form-check-label' do
= _('Allow edits from maintainers.') = _('Allow edits from maintainers.')
= link_to 'About this feature', help_page_path('user/project/merge_requests/maintainer_access') = link_to 'About this feature', help_page_path('user/project/merge_requests/maintainer_access')
.form-text.text-muted .form-text.text-muted
......
...@@ -11,16 +11,16 @@ ...@@ -11,16 +11,16 @@
.col-sm-10.offset-sm-2 .col-sm-10.offset-sm-2
- if issuable.can_remove_source_branch?(current_user) - if issuable.can_remove_source_branch?(current_user)
.form-check .form-check
= label_tag 'merge_request[force_remove_source_branch]' do = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil
= hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil = check_box_tag 'merge_request[force_remove_source_branch]', '1', issuable.force_remove_source_branch?, class: 'form-check-input'
= check_box_tag 'merge_request[force_remove_source_branch]', '1', issuable.force_remove_source_branch? = label_tag 'merge_request[force_remove_source_branch]', class: 'form-check-label' do
Remove source branch when merge request is accepted. Remove source branch when merge request is accepted.
.form-group .form-group
.col-sm-10.col-sm-offset-2 .col-sm-10.col-sm-offset-2
.checkbox .form-check
= label_tag 'merge_request[squash]' do = hidden_field_tag 'merge_request[squash]', '0', id: nil
= hidden_field_tag 'merge_request[squash]', '0', id: nil = check_box_tag 'merge_request[squash]', '1', issuable.squash, class: 'form-check-input'
= check_box_tag 'merge_request[squash]', '1', issuable.squash = label_tag 'merge_request[squash]', class: 'form-check-label' do
Squash commits when merge request is accepted. Squash commits when merge request is accepted.
= link_to 'About this feature', help_page_path('user/project/merge_requests/squash_and_merge') = link_to 'About this feature', help_page_path('user/project/merge_requests/squash_and_merge')
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
- field_id = "#{notifications_menu_identifier("modal", notification_setting)}_notification_setting[#{event}]" - field_id = "#{notifications_menu_identifier("modal", notification_setting)}_notification_setting[#{event}]"
.form-group .form-group
.form-check{ class: ("prepend-top-0" if index == 0) } .form-check{ class: ("prepend-top-0" if index == 0) }
%label{ for: field_id } = check_box("notification_setting", event, id: field_id, class: "js-custom-notification-event form-check-input", checked: notification_setting.public_send(event))
= check_box("notification_setting", event, id: field_id, class: "js-custom-notification-event", checked: notification_setting.public_send(event)) %label.form-check-label{ for: field_id }
%strong %strong
= notification_event_name(event) = notification_event_name(event)
= icon("spinner spin", class: "custom-notification-event-loading") = icon("spinner spin", class: "custom-notification-event-loading")
...@@ -4,26 +4,26 @@ ...@@ -4,26 +4,26 @@
= label :active, "Active", class: 'col-form-label col-sm-2' = label :active, "Active", class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.check_box :active = f.check_box :active, { class: 'form-check-input' }
%span.light Paused Runners don't accept new jobs %span.light Paused Runners don't accept new jobs
.form-group.row .form-group.row
= label :protected, "Protected", class: 'col-form-label col-sm-2' = label :protected, "Protected", class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.check_box :access_level, {}, 'ref_protected', 'not_protected' = f.check_box :access_level, { class: 'form-check-input' }, 'ref_protected', 'not_protected'
%span.light This runner will only run on pipelines triggered on protected branches %span.light This runner will only run on pipelines triggered on protected branches
.form-group.row .form-group.row
= label :run_untagged, 'Run untagged jobs', class: 'col-form-label col-sm-2' = label :run_untagged, 'Run untagged jobs', class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.check_box :run_untagged = f.check_box :run_untagged, { class: 'form-check-input' }
%span.light Indicates whether this runner can pick jobs without tags %span.light Indicates whether this runner can pick jobs without tags
- unless runner.group_type? - unless runner.group_type?
.form-group.row .form-group.row
= label :locked, _('Lock to current projects'), class: 'col-form-label col-sm-2' = label :locked, _('Lock to current projects'), class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.check_box :locked = f.check_box :locked, { class: 'form-check-input' }
%span.light= _('When a runner is locked, it cannot be assigned to other projects') %span.light= _('When a runner is locked, it cannot be assigned to other projects')
.form-group.row .form-group.row
= label_tag :token, class: 'col-form-label col-sm-2' do = label_tag :token, class: 'col-form-label col-sm-2' do
......
...@@ -10,80 +10,70 @@ ...@@ -10,80 +10,70 @@
Use this token to validate received payloads. It will be sent with the request in the X-Gitlab-Token HTTP header. Use this token to validate received payloads. It will be sent with the request in the X-Gitlab-Token HTTP header.
.form-group .form-group
= form.label :url, 'Trigger', class: 'label-light' = form.label :url, 'Trigger', class: 'label-light'
%ul.list-unstyled %ul.list-unstyled.prepend-left-20
%li %li
= form.check_box :push_events, class: 'float-left' = form.check_box :push_events, class: 'form-check-input'
.prepend-left-20 = form.label :push_events, class: 'list-label form-check-label ml-1' do
= form.label :push_events, class: 'list-label' do %strong Push events
%strong Push events %p.light.ml-1
%p.light This URL will be triggered by a push to the repository
This URL will be triggered by a push to the repository
%li %li
= form.check_box :tag_push_events, class: 'float-left' = form.check_box :tag_push_events, class: 'form-check-input'
.prepend-left-20 = form.label :tag_push_events, class: 'list-label form-check-label ml-1' do
= form.label :tag_push_events, class: 'list-label' do %strong Tag push events
%strong Tag push events %p.light.ml-1
%p.light This URL will be triggered when a new tag is pushed to the repository
This URL will be triggered when a new tag is pushed to the repository
%li %li
= form.check_box :note_events, class: 'float-left' = form.check_box :note_events, class: 'form-check-input'
.prepend-left-20 = form.label :note_events, class: 'list-label form-check-label ml-1' do
= form.label :note_events, class: 'list-label' do %strong Comments
%strong Comments %p.light.ml-1
%p.light This URL will be triggered when someone adds a comment
This URL will be triggered when someone adds a comment
%li %li
= form.check_box :confidential_note_events, class: 'float-left' = form.check_box :confidential_note_events, class: 'form-check-input'
.prepend-left-20 = form.label :confidential_note_events, class: 'list-label form-check-label ml-1' do
= form.label :confidential_note_events, class: 'list-label' do %strong Confidential Comments
%strong Confidential Comments %p.light.ml-1
%p.light This URL will be triggered when someone adds a comment on a confidential issue
This URL will be triggered when someone adds a comment on a confidential issue
%li %li
= form.check_box :issues_events, class: 'float-left' = form.check_box :issues_events, class: 'form-check-input'
.prepend-left-20 = form.label :issues_events, class: 'list-label form-check-label ml-1' do
= form.label :issues_events, class: 'list-label' do %strong Issues events
%strong Issues events %p.light.ml-1
%p.light This URL will be triggered when an issue is created/updated/merged
This URL will be triggered when an issue is created/updated/merged
%li %li
= form.check_box :confidential_issues_events, class: 'float-left' = form.check_box :confidential_issues_events, class: 'form-check-input'
.prepend-left-20 = form.label :confidential_issues_events, class: 'list-label form-check-label ml-1' do
= form.label :confidential_issues_events, class: 'list-label' do %strong Confidential Issues events
%strong Confidential Issues events %p.light.ml-1
%p.light This URL will be triggered when a confidential issue is created/updated/merged
This URL will be triggered when a confidential issue is created/updated/merged
%li %li
= form.check_box :merge_requests_events, class: 'float-left' = form.check_box :merge_requests_events, class: 'form-check-input'
.prepend-left-20 = form.label :merge_requests_events, class: 'list-label form-check-label ml-1' do
= form.label :merge_requests_events, class: 'list-label' do %strong Merge request events
%strong Merge request events %p.light.ml-1
%p.light This URL will be triggered when a merge request is created/updated/merged
This URL will be triggered when a merge request is created/updated/merged
%li %li
= form.check_box :job_events, class: 'float-left' = form.check_box :job_events, class: 'form-check-input'
.prepend-left-20 = form.label :job_events, class: 'list-label form-check-label ml-1' do
= form.label :job_events, class: 'list-label' do %strong Job events
%strong Job events %p.light.ml-1
%p.light This URL will be triggered when the job status changes
This URL will be triggered when the job status changes
%li %li
= form.check_box :pipeline_events, class: 'float-left' = form.check_box :pipeline_events, class: 'form-check-input'
.prepend-left-20 = form.label :pipeline_events, class: 'list-label form-check-label ml-1' do
= form.label :pipeline_events, class: 'list-label' do %strong Pipeline events
%strong Pipeline events %p.light.ml-1
%p.light This URL will be triggered when the pipeline status changes
This URL will be triggered when the pipeline status changes
%li %li
= form.check_box :wiki_page_events, class: 'float-left' = form.check_box :wiki_page_events, class: 'form-check-input'
.prepend-left-20 = form.label :wiki_page_events, class: 'list-label form-check-label ml-1' do
= form.label :wiki_page_events, class: 'list-label' do %strong Wiki Page events
%strong Wiki Page events %p.light.ml-1
%p.light This URL will be triggered when a wiki page is created/updated
This URL will be triggered when a wiki page is created/updated
.form-group .form-group
= form.label :enable_ssl_verification, 'SSL verification', class: 'label-light checkbox' = form.label :enable_ssl_verification, 'SSL verification', class: 'label-light checkbox'
.form-check .form-check
= form.label :enable_ssl_verification do = form.check_box :enable_ssl_verification, class: 'form-check-input'
= form.check_box :enable_ssl_verification = form.label :enable_ssl_verification, class: 'form-check-label ml-1' do
%strong Enable SSL verification %strong Enable SSL verification
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