diff options
Diffstat (limited to 'app/views/admin/application_settings')
27 files changed, 134 insertions, 134 deletions
diff --git a/app/views/admin/application_settings/_abuse.html.haml b/app/views/admin/application_settings/_abuse.html.haml index 39dcc28a397..6b9b2a17dd9 100644 --- a/app/views/admin/application_settings/_abuse.html.haml +++ b/app/views/admin/application_settings/_abuse.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row = f.label :admin_notification_email, 'Abuse reports notification email', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :admin_notification_email, class: 'form-control' diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml index bbfae062624..4cd2941202c 100644 --- a/app/views/admin/application_settings/_account_and_limit.html.haml +++ b/app/views/admin/application_settings/_account_and_limit.html.haml @@ -1,34 +1,34 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :gravatar_enabled do = f.check_box :gravatar_enabled Gravatar enabled - .form-group + .form-group.row = f.label :default_projects_limit, class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :default_projects_limit, class: 'form-control' - .form-group + .form-group.row = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :max_attachment_size, class: 'form-control' - .form-group + .form-group.row = f.label :session_expire_delay, 'Session duration (minutes)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :session_expire_delay, class: 'form-control' %span.form-text.text-muted#session_expire_delay_help_block GitLab restart is required to apply changes - .form-group + .form-group.row = f.label :user_oauth_applications, 'User OAuth applications', class: 'col-form-label col-sm-2' .col-sm-10 .form-check = f.label :user_oauth_applications do = f.check_box :user_oauth_applications Allow users to register any application to use GitLab as an OAuth provider - .form-group + .form-group.row = f.label :user_default_external, 'New users set to external', class: 'col-form-label col-sm-2' .col-sm-10 .form-check diff --git a/app/views/admin/application_settings/_background_jobs.html.haml b/app/views/admin/application_settings/_background_jobs.html.haml index 835b8c80763..5c10b9e3922 100644 --- a/app/views/admin/application_settings/_background_jobs.html.haml +++ b/app/views/admin/application_settings/_background_jobs.html.haml @@ -1,4 +1,4 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset @@ -6,7 +6,7 @@ These settings require a = link_to 'restart', help_page_path('administration/restart_gitlab') to take effect. - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :sidekiq_throttling_enabled do @@ -14,13 +14,13 @@ Enable Sidekiq Job Throttling .form-text.text-muted Limit the amount of resources slow running jobs are assigned. - .form-group + .form-group.row = f.label :sidekiq_throttling_queues, 'Sidekiq queues to throttle', class: 'col-form-label col-sm-2' .col-sm-10 = f.select :sidekiq_throttling_queues, sidekiq_queue_options_for_select, { include_hidden: false }, multiple: true, class: 'select2 select-wide', data: { field: 'sidekiq_throttling_queues' } .form-text.text-muted Choose which queues you wish to throttle. - .form-group + .form-group.row = f.label :sidekiq_throttling_factor, 'Throttling Factor', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :sidekiq_throttling_factor, class: 'form-control', min: '0.01', max: '0.99', step: '0.01' diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index 37ed551757c..f9788c15e5f 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :auto_devops_enabled do @@ -11,31 +11,31 @@ .form-text.text-muted It will automatically build, test, and deploy applications based on a predefined CI/CD configuration = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md') - .form-group + .form-group.row = f.label :auto_devops_domain, class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :auto_devops_domain, class: 'form-control', placeholder: 'domain.com' .form-text.text-muted = s_("AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages.") - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :shared_runners_enabled do = f.check_box :shared_runners_enabled Enable shared runners for new projects - .form-group + .form-group.row = f.label :shared_runners_text, class: 'col-form-label col-sm-2' .col-sm-10 = f.text_area :shared_runners_text, class: 'form-control', rows: 4 .form-text.text-muted Markdown enabled - .form-group + .form-group.row = f.label :max_artifacts_size, 'Maximum artifacts size (MB)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :max_artifacts_size, class: 'form-control' .form-text.text-muted Set the maximum file size for each job's artifacts = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'maximum-artifacts-size') - .form-group + .form-group.row = f.label :default_artifacts_expire_in, 'Default artifacts expiration', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :default_artifacts_expire_in, class: 'form-control' diff --git a/app/views/admin/application_settings/_email.html.haml b/app/views/admin/application_settings/_email.html.haml index 59f654b62f7..fbcf9126a28 100644 --- a/app/views/admin/application_settings/_email.html.haml +++ b/app/views/admin/application_settings/_email.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :email_author_in_body do @@ -12,7 +12,7 @@ Some email servers do not support overriding the email sender name. Enable this option to include the name of the author of the issue, merge request or comment in the email body instead. - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :html_emails_enabled do diff --git a/app/views/admin/application_settings/_gitaly.html.haml b/app/views/admin/application_settings/_gitaly.html.haml index 3a168cc879d..859a1c6f45c 100644 --- a/app/views/admin/application_settings/_gitaly.html.haml +++ b/app/views/admin/application_settings/_gitaly.html.haml @@ -1,15 +1,15 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row = f.label :gitaly_timeout_default, 'Default Timeout Period', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :gitaly_timeout_default, class: 'form-control' .form-text.text-muted Timeout for Gitaly calls from the GitLab application (in seconds). This timeout is not enforced for git fetch/push operations or Sidekiq jobs. - .form-group + .form-group.row = f.label :gitaly_timeout_fast, 'Fast Timeout Period', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :gitaly_timeout_fast, class: 'form-control' @@ -17,7 +17,7 @@ Fast operation timeout (in seconds). Some Gitaly operations are expected to be fast. If they exceed this threshold, there may be a problem with a storage shard and 'failing fast' can help maintain the stability of the GitLab instance. - .form-group + .form-group.row = f.label :gitaly_timeout_medium, 'Medium Timeout Period', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :gitaly_timeout_medium, class: 'form-control' diff --git a/app/views/admin/application_settings/_help_page.html.haml b/app/views/admin/application_settings/_help_page.html.haml index fae4ef8286b..fbba8cae660 100644 --- a/app/views/admin/application_settings/_help_page.html.haml +++ b/app/views/admin/application_settings/_help_page.html.haml @@ -1,19 +1,19 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row = f.label :help_page_text, class: 'col-form-label col-sm-2' .col-sm-10 = f.text_area :help_page_text, class: 'form-control', rows: 4 .form-text.text-muted Markdown enabled - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :help_page_hide_commercial_content do = f.check_box :help_page_hide_commercial_content Hide marketing-related entries from help - .form-group + .form-group.row = f.label :help_page_support_url, 'Support page URL', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :help_page_support_url, class: 'form-control', placeholder: 'http://company.example.com/getting-help', :'aria-describedby' => 'support_help_block' diff --git a/app/views/admin/application_settings/_influx.html.haml b/app/views/admin/application_settings/_influx.html.haml index 51c9b3d534b..84ed00c350b 100644 --- a/app/views/admin/application_settings/_influx.html.haml +++ b/app/views/admin/application_settings/_influx.html.haml @@ -1,4 +1,4 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset @@ -8,17 +8,17 @@ = link_to 'restart', help_page_path('administration/restart_gitlab') to take effect. = link_to icon('question-circle'), help_page_path('administration/monitoring/performance/introduction') - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :metrics_enabled do = f.check_box :metrics_enabled Enable InfluxDB Metrics - .form-group + .form-group.row = f.label :metrics_host, 'InfluxDB host', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :metrics_host, class: 'form-control', placeholder: 'influxdb.example.com' - .form-group + .form-group.row = f.label :metrics_port, 'InfluxDB port', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :metrics_port, class: 'form-control', placeholder: '8089' @@ -27,7 +27,7 @@ your server configuration specifies a database to store data in when sending messages to this port, without it metrics data will not be saved. - .form-group + .form-group.row = f.label :metrics_pool_size, 'Connection pool size', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :metrics_pool_size, class: 'form-control' @@ -36,28 +36,28 @@ lazily. Users using multi-threaded application servers should ensure enough connections are available (at minimum the amount of application server threads). - .form-group + .form-group.row = f.label :metrics_timeout, 'Connection timeout', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :metrics_timeout, class: 'form-control' .form-text.text-muted The amount of seconds after which an InfluxDB connection will time out. - .form-group + .form-group.row = f.label :metrics_method_call_threshold, 'Method Call Threshold (ms)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :metrics_method_call_threshold, class: 'form-control' .form-text.text-muted A method call is only tracked when it takes longer to complete than the given amount of milliseconds. - .form-group + .form-group.row = f.label :metrics_sample_interval, 'Sampler Interval (sec)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :metrics_sample_interval, class: 'form-control' .form-text.text-muted The sampling interval in seconds. Sampled data includes memory usage, retained Ruby objects, file descriptors and so on. - .form-group + .form-group.row = f.label :metrics_packet_size, 'Metrics per packet', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :metrics_packet_size, class: 'form-control' diff --git a/app/views/admin/application_settings/_ip_limits.html.haml b/app/views/admin/application_settings/_ip_limits.html.haml index 5f7fdd08225..d9dc8634b9f 100644 --- a/app/views/admin/application_settings/_ip_limits.html.haml +++ b/app/views/admin/application_settings/_ip_limits.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :throttle_unauthenticated_enabled do @@ -10,15 +10,15 @@ Enable unauthenticated request rate limit %span.form-text.text-muted Helps reduce request volume (e.g. from crawlers or abusive bots) - .form-group + .form-group.row = f.label :throttle_unauthenticated_requests_per_period, 'Max requests per period per IP', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :throttle_unauthenticated_requests_per_period, class: 'form-control' - .form-group + .form-group.row = f.label :throttle_unauthenticated_period_in_seconds, 'Rate limit period in seconds', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :throttle_unauthenticated_period_in_seconds, class: 'form-control' - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :throttle_authenticated_api_enabled do @@ -26,15 +26,15 @@ Enable authenticated API request rate limit %span.form-text.text-muted Helps reduce request volume (e.g. from crawlers or abusive bots) - .form-group + .form-group.row = f.label :throttle_authenticated_api_requests_per_period, 'Max requests per period per user', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :throttle_authenticated_api_requests_per_period, class: 'form-control' - .form-group + .form-group.row = f.label :throttle_authenticated_api_period_in_seconds, 'Rate limit period in seconds', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :throttle_authenticated_api_period_in_seconds, class: 'form-control' - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :throttle_authenticated_web_enabled do @@ -42,11 +42,11 @@ Enable authenticated web request rate limit %span.form-text.text-muted Helps reduce request volume (e.g. from crawlers or abusive bots) - .form-group + .form-group.row = f.label :throttle_authenticated_web_requests_per_period, 'Max requests per period per user', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :throttle_authenticated_web_requests_per_period, class: 'form-control' - .form-group + .form-group.row = f.label :throttle_authenticated_web_period_in_seconds, 'Rate limit period in seconds', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :throttle_authenticated_web_period_in_seconds, class: 'form-control' diff --git a/app/views/admin/application_settings/_koding.html.haml b/app/views/admin/application_settings/_koding.html.haml index d084286d6c8..9d3cef89a47 100644 --- a/app/views/admin/application_settings/_koding.html.haml +++ b/app/views/admin/application_settings/_koding.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :koding_enabled do @@ -10,7 +10,7 @@ Enable Koding .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. - .form-group + .form-group.row = f.label :koding_url, 'Koding URL', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090' diff --git a/app/views/admin/application_settings/_logging.html.haml b/app/views/admin/application_settings/_logging.html.haml index 062787c6afd..e0f1a4a8799 100644 --- a/app/views/admin/application_settings/_logging.html.haml +++ b/app/views/admin/application_settings/_logging.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :sentry_enabled do @@ -13,12 +13,12 @@ Sentry is an error reporting and logging tool which is currently not shipped with GitLab, get it here: %a{ href: 'https://getsentry.com', target: '_blank', rel: 'noopener noreferrer' } https://getsentry.com - .form-group + .form-group.row = f.label :sentry_dsn, 'Sentry DSN', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :sentry_dsn, class: 'form-control' - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :clientside_sentry_enabled do @@ -28,7 +28,7 @@ Sentry can also be used for reporting and logging clientside exceptions. %a{ href: 'https://sentry.io/for/javascript/', target: '_blank', rel: 'noopener noreferrer' } https://sentry.io/for/javascript/ - .form-group + .form-group.row = f.label :clientside_sentry_dsn, 'Clientside Sentry DSN', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :clientside_sentry_dsn, class: 'form-control' diff --git a/app/views/admin/application_settings/_outbound.html.haml b/app/views/admin/application_settings/_outbound.html.haml index fdd549cd4a2..7a4adbd8d3b 100644 --- a/app/views/admin/application_settings/_outbound.html.haml +++ b/app/views/admin/application_settings/_outbound.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :allow_local_requests_from_hooks_and_services do diff --git a/app/views/admin/application_settings/_pages.html.haml b/app/views/admin/application_settings/_pages.html.haml index 9f5044d4d1c..a7e0f288384 100644 --- a/app/views/admin/application_settings/_pages.html.haml +++ b/app/views/admin/application_settings/_pages.html.haml @@ -1,13 +1,13 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row = f.label :max_pages_size, 'Maximum size of pages (MB)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :max_pages_size, class: 'form-control' .form-text.text-muted 0 for unlimited - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :pages_domain_verification_enabled do diff --git a/app/views/admin/application_settings/_performance.html.haml b/app/views/admin/application_settings/_performance.html.haml index 5b700d378e6..5473f45effc 100644 --- a/app/views/admin/application_settings/_performance.html.haml +++ b/app/views/admin/application_settings/_performance.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :authorized_keys_enabled do diff --git a/app/views/admin/application_settings/_performance_bar.html.haml b/app/views/admin/application_settings/_performance_bar.html.haml index c5551515172..66979d0eb0d 100644 --- a/app/views/admin/application_settings/_performance_bar.html.haml +++ b/app/views/admin/application_settings/_performance_bar.html.haml @@ -1,14 +1,14 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :performance_bar_enabled do = f.check_box :performance_bar_enabled Enable the Performance Bar - .form-group + .form-group.row = f.label :performance_bar_allowed_group_id, 'Allowed group', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :performance_bar_allowed_group_id, class: 'form-control', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path diff --git a/app/views/admin/application_settings/_plantuml.html.haml b/app/views/admin/application_settings/_plantuml.html.haml index 7eb46c68842..68001f6d4a0 100644 --- a/app/views/admin/application_settings/_plantuml.html.haml +++ b/app/views/admin/application_settings/_plantuml.html.haml @@ -1,14 +1,14 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :plantuml_enabled do = f.check_box :plantuml_enabled Enable PlantUML - .form-group + .form-group.row = f.label :plantuml_url, 'PlantUML URL', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :plantuml_url, class: 'form-control', placeholder: 'http://gitlab.your-plantuml-instance.com:8080' diff --git a/app/views/admin/application_settings/_prometheus.html.haml b/app/views/admin/application_settings/_prometheus.html.haml index 369efe40ff6..4b30a7890de 100644 --- a/app/views/admin/application_settings/_prometheus.html.haml +++ b/app/views/admin/application_settings/_prometheus.html.haml @@ -1,4 +1,4 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset @@ -11,7 +11,7 @@ = link_to 'restart', help_page_path('administration/restart_gitlab') to take effect. = link_to icon('question-circle'), help_page_path('administration/monitoring/prometheus/index') - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :prometheus_metrics_enabled do diff --git a/app/views/admin/application_settings/_realtime.html.haml b/app/views/admin/application_settings/_realtime.html.haml index 414b84c78fb..63a592cc2fd 100644 --- a/app/views/admin/application_settings/_realtime.html.haml +++ b/app/views/admin/application_settings/_realtime.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row = f.label :polling_interval_multiplier, 'Polling interval multiplier', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :polling_interval_multiplier, class: 'form-control' diff --git a/app/views/admin/application_settings/_registry.html.haml b/app/views/admin/application_settings/_registry.html.haml index 025ae0df12e..8524cbfe4d9 100644 --- a/app/views/admin/application_settings/_registry.html.haml +++ b/app/views/admin/application_settings/_registry.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row = f.label :container_registry_token_expire_delay, 'Authorization token duration (minutes)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :container_registry_token_expire_delay, class: 'form-control' diff --git a/app/views/admin/application_settings/_repository_check.html.haml b/app/views/admin/application_settings/_repository_check.html.haml index 1ddf316f4cb..8d149bcbedb 100644 --- a/app/views/admin/application_settings/_repository_check.html.haml +++ b/app/views/admin/application_settings/_repository_check.html.haml @@ -1,10 +1,10 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset .sub-section %h4 Repository checks - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :repository_checks_enabled do @@ -14,7 +14,7 @@ GitLab will periodically run %a{ href: 'https://www.kernel.org/pub/software/scm/git/docs/git-fsck.html', target: 'blank' } 'git fsck' in all project and wiki repositories to look for silent disk corruption issues. - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 = link_to 'Clear all repository checks', clear_repository_check_states_admin_application_settings_path, data: { confirm: 'This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?' }, method: :put, class: "btn btn-sm btn-remove" .form-text.text-muted @@ -22,7 +22,7 @@ .sub-section %h4 Housekeeping - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :housekeeping_enabled do @@ -40,19 +40,19 @@ .form-text.text-muted Creating pack file bitmaps makes housekeeping take a little longer but bitmaps should accelerate 'git clone' performance. - .form-group + .form-group.row = f.label :housekeeping_incremental_repack_period, 'Incremental repack period', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :housekeeping_incremental_repack_period, class: 'form-control' .form-text.text-muted Number of Git pushes after which an incremental 'git repack' is run. - .form-group + .form-group.row = f.label :housekeeping_full_repack_period, 'Full repack period', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :housekeeping_full_repack_period, class: 'form-control' .form-text.text-muted Number of Git pushes after which a full 'git repack' is run. - .form-group + .form-group.row = f.label :housekeeping_gc_period, 'Git GC period', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :housekeeping_gc_period, class: 'form-control' diff --git a/app/views/admin/application_settings/_repository_storage.html.haml b/app/views/admin/application_settings/_repository_storage.html.haml index 03bdb86fac2..5a9612b0ada 100644 --- a/app/views/admin/application_settings/_repository_storage.html.haml +++ b/app/views/admin/application_settings/_repository_storage.html.haml @@ -1,9 +1,9 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset .sub-section - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :hashed_storage_enabled do @@ -13,7 +13,7 @@ Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance. %em (EXPERIMENTAL) - .form-group + .form-group.row = f.label :repository_storages, 'Storage paths for new projects', class: 'col-form-label col-sm-2' .col-sm-10 = f.select :repository_storages, repository_storages_options_for_select(@application_setting.repository_storages), @@ -24,31 +24,31 @@ = link_to "repository storages documentation", help_page_path("administration/repository_storages") .sub-section %h4 Circuit breaker - .form-group + .form-group.row = f.label :circuitbreaker_check_interval, _('Check interval'), class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :circuitbreaker_check_interval, class: 'form-control' .form-text.text-muted = circuitbreaker_check_interval_help_text - .form-group + .form-group.row = f.label :circuitbreaker_access_retries, _('Number of access attempts'), class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :circuitbreaker_access_retries, class: 'form-control' .form-text.text-muted = circuitbreaker_access_retries_help_text - .form-group + .form-group.row = f.label :circuitbreaker_storage_timeout, _('Seconds to wait for a storage access attempt'), class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :circuitbreaker_storage_timeout, class: 'form-control' .form-text.text-muted = circuitbreaker_storage_timeout_help_text - .form-group + .form-group.row = f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :circuitbreaker_failure_count_threshold, class: 'form-control' .form-text.text-muted = circuitbreaker_failure_count_help_text - .form-group + .form-group.row = f.label :circuitbreaker_failure_reset_time, _('Seconds before reseting failure information'), class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :circuitbreaker_failure_reset_time, class: 'form-control' diff --git a/app/views/admin/application_settings/_signin.html.haml b/app/views/admin/application_settings/_signin.html.haml index bb7adf49b31..2ba1b92f37c 100644 --- a/app/views/admin/application_settings/_signin.html.haml +++ b/app/views/admin/application_settings/_signin.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :password_authentication_enabled_for_web do @@ -10,7 +10,7 @@ Password authentication enabled for web interface .form-text.text-muted When disabled, an external authentication provider must be used. - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :password_authentication_enabled_for_git do @@ -22,35 +22,35 @@ or LDAP password must be used to authenticate. - if omniauth_enabled? && button_based_providers.any? - .form-group + .form-group.row = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'col-form-label col-sm-2' .col-sm-10 .btn-group{ data: { toggle: 'buttons' } } - oauth_providers_checkboxes.each do |source| = source - .form-group + .form-group.row = f.label :two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2' .col-sm-10 .form-check = f.label :require_two_factor_authentication do = f.check_box :require_two_factor_authentication Require all users to setup Two-factor authentication - .form-group + .form-group.row = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :two_factor_grace_period, min: 0, class: 'form-control', placeholder: '0' .form-text.text-muted Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication - .form-group + .form-group.row = f.label :home_page_url, 'Home page URL', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block' %span.form-text.text-muted#home_help_block We will redirect non-logged in users to this page - .form-group + .form-group.row = f.label :after_sign_out_path, class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :after_sign_out_path, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'after_sign_out_path_help_block' %span.form-text.text-muted#after_sign_out_path_help_block We will redirect users to this page after they sign out - .form-group + .form-group.row = f.label :sign_in_text, class: 'col-form-label col-sm-2' .col-sm-10 = f.text_area :sign_in_text, class: 'form-control', rows: 4 diff --git a/app/views/admin/application_settings/_signup.html.haml b/app/views/admin/application_settings/_signup.html.haml index c83d3e5ed09..42f92b81b58 100644 --- a/app/views/admin/application_settings/_signup.html.haml +++ b/app/views/admin/application_settings/_signup.html.haml @@ -1,32 +1,32 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :signup_enabled do = f.check_box :signup_enabled Sign-up enabled - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :send_user_confirmation_email do = f.check_box :send_user_confirmation_email Send confirmation email on sign-up - .form-group + .form-group.row = f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_area :domain_whitelist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8 .form-text.text-muted ONLY users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com - .form-group + .form-group.row = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'col-form-label col-sm-2' .col-sm-10 .form-check = f.label :domain_blacklist_enabled do = f.check_box :domain_blacklist_enabled Enable domain blacklist for sign ups - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = label_tag :blacklist_type_file do @@ -38,18 +38,18 @@ = radio_button_tag :blacklist_type, :raw, @application_setting.domain_blacklist.present? || @application_setting.domain_blacklist.blank? .option-title Enter blacklist manually - .form-group.blacklist-file + .form-group.row.blacklist-file = f.label :domain_blacklist_file, 'Blacklist file', class: 'col-form-label col-sm-2' .col-sm-10 = f.file_field :domain_blacklist_file, class: 'form-control', accept: '.txt,.conf' .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines or commas for multiple entries. - .form-group.blacklist-raw + .form-group.row.blacklist-raw = f.label :domain_blacklist, 'Blacklisted domains for sign-ups', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_area :domain_blacklist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8 .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com - .form-group + .form-group.row = f.label :after_sign_up_text, class: 'col-form-label col-sm-2' .col-sm-10 = f.text_area :after_sign_up_text, class: 'form-control', rows: 4 diff --git a/app/views/admin/application_settings/_spam.html.haml b/app/views/admin/application_settings/_spam.html.haml index 50197211ac7..d421f6d3706 100644 --- a/app/views/admin/application_settings/_spam.html.haml +++ b/app/views/admin/application_settings/_spam.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :recaptcha_enabled do @@ -10,7 +10,7 @@ Enable reCAPTCHA %span.form-text.text-muted#recaptcha_help_block Helps prevent bots from creating accounts - .form-group + .form-group.row = f.label :recaptcha_site_key, 'reCAPTCHA Site Key', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :recaptcha_site_key, class: 'form-control' @@ -18,12 +18,12 @@ Generate site and private keys at %a{ href: 'http://www.google.com/recaptcha', target: 'blank' } http://www.google.com/recaptcha - .form-group + .form-group.row = f.label :recaptcha_private_key, 'reCAPTCHA Private Key', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :recaptcha_private_key, class: 'form-control' - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :akismet_enabled do @@ -31,7 +31,7 @@ Enable Akismet %span.form-text.text-muted#akismet_help_block Helps prevent bots from creating issues - .form-group + .form-group.row = f.label :akismet_api_key, 'Akismet API Key', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :akismet_api_key, class: 'form-control' @@ -39,7 +39,7 @@ Generate API key at %a{ href: 'http://www.akismet.com', target: 'blank' } http://www.akismet.com - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :unique_ips_limit_enabled do @@ -48,14 +48,14 @@ %span.form-text.text-muted#unique_ip_help_block Helps prevent malicious users hide their activity - .form-group + .form-group.row = f.label :unique_ips_limit_per_user, 'IPs per user', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :unique_ips_limit_per_user, class: 'form-control' .form-text.text-muted Maximum number of unique IPs per user - .form-group + .form-group.row = f.label :unique_ips_limit_time_window, 'IP expiration time', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :unique_ips_limit_time_window, class: 'form-control' diff --git a/app/views/admin/application_settings/_terminal.html.haml b/app/views/admin/application_settings/_terminal.html.haml index 70eabfcdae4..ae02d07e556 100644 --- a/app/views/admin/application_settings/_terminal.html.haml +++ b/app/views/admin/application_settings/_terminal.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row = f.label :terminal_max_session_time, 'Max session time', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :terminal_max_session_time, class: 'form-control' diff --git a/app/views/admin/application_settings/_usage.html.haml b/app/views/admin/application_settings/_usage.html.haml index f5c3dcc3b41..8e5699b1761 100644 --- a/app/views/admin/application_settings/_usage.html.haml +++ b/app/views/admin/application_settings/_usage.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :version_check_enabled do @@ -12,7 +12,7 @@ GitLab will inform you if a new version is available. = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "version-check") about what information is shared with GitLab Inc. - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 - can_be_configured = @application_setting.usage_ping_can_be_configured? .form-check diff --git a/app/views/admin/application_settings/_visibility_and_access.html.haml b/app/views/admin/application_settings/_visibility_and_access.html.haml index 5506ceab58f..40a3250dca8 100644 --- a/app/views/admin/application_settings/_visibility_and_access.html.haml +++ b/app/views/admin/application_settings/_visibility_and_access.html.haml @@ -1,24 +1,24 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row = f.label :default_branch_protection, class: 'col-form-label col-sm-2' .col-sm-10 = f.select :default_branch_protection, options_for_select(Gitlab::Access.protection_options, @application_setting.default_branch_protection), {}, class: 'form-control' - .form-group.visibility-level-setting + .form-group.row.visibility-level-setting = f.label :default_project_visibility, class: 'col-form-label col-sm-2' .col-sm-10 = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new) - .form-group.visibility-level-setting + .form-group.row.visibility-level-setting = f.label :default_snippet_visibility, class: 'col-form-label col-sm-2' .col-sm-10 = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: ProjectSnippet.new) - .form-group.visibility-level-setting + .form-group.row.visibility-level-setting = f.label :default_group_visibility, class: 'col-form-label col-sm-2' .col-sm-10 = render('shared/visibility_radios', model_method: :default_group_visibility, form: f, selected_level: @application_setting.default_group_visibility, form_model: Group.new) - .form-group + .form-group.row = f.label :restricted_visibility_levels, class: 'col-form-label col-sm-2' .col-sm-10 - checkbox_name = 'application_setting[restricted_visibility_levels][]' @@ -29,7 +29,7 @@ %span.form-text.text-muted#restricted-visibility-help Selected levels cannot be used by non-admin users for projects or snippets. If the public level is restricted, user profiles are only visible to logged in users. - .form-group + .form-group.row = f.label :import_sources, class: 'col-form-label col-sm-2' .col-sm-10 - import_sources_checkboxes('import-sources-help').each do |source| @@ -42,14 +42,14 @@ and GitLab.com = link_to "(?)", help_page_path("integration/gitlab") - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check = f.label :project_export_enabled do = f.check_box :project_export_enabled Project export enabled - .form-group + .form-group.row %label.col-form-label.col-sm-2 Enabled Git access protocols .col-sm-10 = select(:application_setting, :enabled_git_access_protocol, [['Both SSH and HTTP(S)', nil], ['Only SSH', 'ssh'], ['Only HTTP(S)', 'http']], {}, class: 'form-control') @@ -58,7 +58,7 @@ - ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type| - field_name = :"#{type}_key_restriction" - .form-group + .form-group.row = f.label field_name, "#{type.upcase} SSH keys", class: 'col-form-label col-sm-2' .col-sm-10 = f.select field_name, key_restriction_options_for_select(type), {}, class: 'form-control' |