diff --git a/app/views/admin/application_settings/_abuse.html.haml b/app/views/admin/application_settings/_abuse.html.haml index c77615f9040e612ded7f6aba50b4f77a6b673b21..ea9bdbed9ae9e412f5c42966e4c9103f4eec05be 100644 --- a/app/views/admin/application_settings/_abuse.html.haml +++ b/app/views/admin/application_settings/_abuse.html.haml @@ -4,7 +4,7 @@ %fieldset .form-group = f.label :abuse_notification_email, 'Abuse reports notification email', class: 'label-bold' - = f.text_field :abuse_notification_email, class: 'form-control' + = f.text_field :abuse_notification_email, class: 'form-control gl-form-input' .form-text.text-muted Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area. 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 cb74af0c243ff8f2717f60b2adc259ee0a0b9ddc..aa57a2e2e853d8b5c7d6ae5226d1eaa149ad018b 100644 --- a/app/views/admin/application_settings/_account_and_limit.html.haml +++ b/app/views/admin/application_settings/_account_and_limit.html.haml @@ -10,23 +10,23 @@ .form-group = f.label :default_projects_limit, _('Default projects limit'), class: 'label-bold' - = f.number_field :default_projects_limit, class: 'form-control', title: _('Maximum number of projects.'), data: { toggle: 'tooltip', container: 'body' } + = f.number_field :default_projects_limit, class: 'form-control gl-form-input', title: _('Maximum number of projects.'), data: { toggle: 'tooltip', container: 'body' } .form-group = f.label :max_attachment_size, _('Maximum attachment size (MB)'), class: 'label-bold' - = f.number_field :max_attachment_size, class: 'form-control', title: _('Maximum size of individual attachments in comments.'), data: { toggle: 'tooltip', container: 'body' } + = f.number_field :max_attachment_size, class: 'form-control gl-form-input', title: _('Maximum size of individual attachments in comments.'), data: { toggle: 'tooltip', container: 'body' } = render_if_exists 'admin/application_settings/repository_size_limit_setting', form: f .form-group = f.label :receive_max_input_size, _('Maximum push size (MB)'), class: 'label-light' - = f.number_field :receive_max_input_size, class: 'form-control qa-receive-max-input-size-field', title: _('Maximum size limit for a single commit.'), data: { toggle: 'tooltip', container: 'body' } + = f.number_field :receive_max_input_size, class: 'form-control gl-form-input qa-receive-max-input-size-field', title: _('Maximum size limit for a single commit.'), data: { toggle: 'tooltip', container: 'body' } .form-group = f.label :max_import_size, _('Maximum import size (MB)'), class: 'label-light' - = f.number_field :max_import_size, class: 'form-control qa-receive-max-import-size-field', title: _('Maximum size of import files.'), data: { toggle: 'tooltip', container: 'body' } + = f.number_field :max_import_size, class: 'form-control gl-form-input qa-receive-max-import-size-field', title: _('Maximum size of import files.'), data: { toggle: 'tooltip', container: 'body' } %span.form-text.text-muted= _('0 for unlimited, only effective with remote storage enabled.') .form-group = f.label :session_expire_delay, _('Session duration (minutes)'), class: 'label-light' - = f.number_field :session_expire_delay, class: 'form-control', title: _('Maximum duration of a session.'), data: { toggle: 'tooltip', container: 'body' } + = f.number_field :session_expire_delay, class: 'form-control gl-form-input', title: _('Maximum duration of a session.'), data: { toggle: 'tooltip', container: 'body' } %span.form-text.text-muted#session_expire_delay_help_block= _('GitLab restart is required to apply changes.') = render_if_exists 'admin/application_settings/personal_access_token_expiration_policy', form: f @@ -47,14 +47,14 @@ = _('Newly registered users will by default be external') .gl-mt-3 = _('Internal users') - = f.text_field :user_default_internal_regex, placeholder: _('Regex pattern'), class: 'form-control gl-mt-2' + = f.text_field :user_default_internal_regex, placeholder: _('Regex pattern'), class: 'form-control gl-form-input gl-mt-2' .help-block = _('Specify an e-mail address regex pattern to identify default internal users.') = link_to _('More information'), help_page_path('user/permissions', anchor: 'setting-new-users-to-external'), target: '_blank' .form-group = f.label :personal_access_token_prefix, _('Personal Access Token prefix'), class: 'label-light' - = f.text_field :personal_access_token_prefix, placeholder: _('Max 20 characters'), class: 'form-control' + = f.text_field :personal_access_token_prefix, placeholder: _('Max 20 characters'), class: 'form-control gl-form-input' .form-group = f.label :user_show_add_ssh_key_message, _('Prompt users to upload SSH keys'), class: 'label-bold' .form-check diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index 351c13d5ad14ad806817dadb33f51642bebff750..331b028f1769aa08536e294de07098ea6cf2ea43 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -14,7 +14,7 @@ = link_to _('More information'), help_page_path('topics/autodevops/index.md'), target: '_blank' .form-group = f.label :auto_devops_domain, s_('AdminSettings|Auto DevOps domain'), class: 'label-bold' - = f.text_field :auto_devops_domain, class: 'form-control', placeholder: 'domain.com' + = f.text_field :auto_devops_domain, class: 'form-control gl-form-input', 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 @@ -27,23 +27,23 @@ .form-group = f.label :shared_runners_text, class: 'label-bold' - = f.text_area :shared_runners_text, class: 'form-control', rows: 4 + = f.text_area :shared_runners_text, class: 'form-control gl-form-input', rows: 4 .form-text.text-muted= _("Markdown enabled") .form-group = f.label :max_artifacts_size, _('Maximum artifacts size (MB)'), class: 'label-bold' - = f.number_field :max_artifacts_size, class: 'form-control' + = f.number_field :max_artifacts_size, class: 'form-control gl-form-input' .form-text.text-muted = _("Set the maximum file size for each job's artifacts") = link_to sprite_icon('question-o'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'maximum-artifacts-size') .form-group = f.label :default_artifacts_expire_in, _('Default artifacts expiration'), class: 'label-bold' - = f.text_field :default_artifacts_expire_in, class: 'form-control' + = f.text_field :default_artifacts_expire_in, class: 'form-control gl-form-input' .form-text.text-muted = html_escape(_("Set the default expiration time for each job's artifacts. 0 for unlimited. The default unit is in seconds, but you can define an alternative. For example: %{code_open}4 mins 2 sec%{code_close}, %{code_open}2h42min%{code_close}.")) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } = link_to sprite_icon('question-o'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'default-artifacts-expiration') .form-group = f.label :archive_builds_in_human_readable, _('Archive jobs'), class: 'label-bold' - = f.text_field :archive_builds_in_human_readable, class: 'form-control', placeholder: 'never' + = f.text_field :archive_builds_in_human_readable, class: 'form-control gl-form-input', placeholder: 'never' .form-text.text-muted = html_escape(_("Set the duration for which the jobs will be considered as old and expired. Once that time passes, the jobs will be archived and no longer able to be retried. Make it empty to never expire jobs. It has to be no less than 1 day, for example: %{code_open}15 days%{code_close}, %{code_open}1 month%{code_close}, %{code_open}2 years%{code_close}.")) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } .form-group @@ -55,7 +55,7 @@ = s_('AdminSettings|When creating a new environment variable it will be protected by default.') .form-group = f.label :ci_config_path, _('Default CI configuration path'), class: 'label-bold' - = f.text_field :default_ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml' + = f.text_field :default_ci_config_path, class: 'form-control gl-form-input', placeholder: '.gitlab-ci.yml' %p.form-text.text-muted = _("The default CI configuration path for new projects.").html_safe = link_to sprite_icon('question-o'), help_page_path('ci/pipelines/settings', anchor: 'custom-cicd-configuration-path'), target: '_blank' diff --git a/app/views/admin/application_settings/_diff_limits.html.haml b/app/views/admin/application_settings/_diff_limits.html.haml index 6811c1e10d61757fa1aa3308075d8ae3c3c47ad4..494558a6c2d0001023ac2521d6d8a96eab5b1258 100644 --- a/app/views/admin/application_settings/_diff_limits.html.haml +++ b/app/views/admin/application_settings/_diff_limits.html.haml @@ -4,7 +4,7 @@ %fieldset .form-group = f.label :diff_max_patch_bytes, 'Maximum diff patch size (Bytes)', class: 'label-light' - = f.number_field :diff_max_patch_bytes, class: 'form-control' + = f.number_field :diff_max_patch_bytes, class: 'form-control gl-form-input' %span.form-text.text-muted Diff files surpassing this limit will be presented as 'too large' and won't be expandable. diff --git a/app/views/admin/application_settings/_eks.html.haml b/app/views/admin/application_settings/_eks.html.haml index 589d754be04d2c5bfcc41fc451d5d05ab58216c3..8897d0eb14b2d4e03f00e87fd2b5ba567293f346 100644 --- a/app/views/admin/application_settings/_eks.html.haml +++ b/app/views/admin/application_settings/_eks.html.haml @@ -20,16 +20,16 @@ Enable Amazon EKS integration .form-group = f.label :eks_account_id, 'Account ID', class: 'label-bold' - = f.text_field :eks_account_id, class: 'form-control' + = f.text_field :eks_account_id, class: 'form-control gl-form-input' .form-group = f.label :eks_access_key_id, 'Access key ID', class: 'label-bold' - = f.text_field :eks_access_key_id, class: 'form-control' + = f.text_field :eks_access_key_id, class: 'form-control gl-form-input' .form-text.text-muted = _('AWS Access Key. Only required if not using role instance credentials') .form-group = f.label :eks_secret_access_key, 'Secret access key', class: 'label-bold' - = f.password_field :eks_secret_access_key, autocomplete: 'off', class: 'form-control' + = f.password_field :eks_secret_access_key, autocomplete: 'off', class: 'form-control gl-form-input' .form-text.text-muted = _('AWS Secret Access Key. Only required if not using role instance credentials') diff --git a/app/views/admin/application_settings/_email.html.haml b/app/views/admin/application_settings/_email.html.haml index dd1be8765051ccd18db6e719ef5c512a8f4ce4a6..89946c63bb008a34900147bcb1092b4ed55a2b8c 100644 --- a/app/views/admin/application_settings/_email.html.haml +++ b/app/views/admin/application_settings/_email.html.haml @@ -18,7 +18,7 @@ = _('By default GitLab sends emails in HTML and plain text formats so mail clients can choose what format to use. Disable this option if you only want to send emails in plain text format.') .form-group = f.label :commit_email_hostname, _('Custom hostname (for private commit emails)'), class: 'label-bold' - = f.text_field :commit_email_hostname, class: 'form-control' + = f.text_field :commit_email_hostname, class: 'form-control gl-form-input' .form-text.text-muted - commit_email_hostname_docs_link = link_to _('Learn more'), help_page_path('user/admin_area/settings/email.md', anchor: 'custom-hostname-for-private-commit-emails'), target: '_blank' = _("This setting will update the hostname that is used to generate private commit emails. %{learn_more}").html_safe % { learn_more: commit_email_hostname_docs_link } diff --git a/app/views/admin/application_settings/_external_authorization_service_form.html.haml b/app/views/admin/application_settings/_external_authorization_service_form.html.haml index 23495586dab1e2a607e23b6317aecd5aa1277168..07256c9f4fe451546648841d70cdef33fc190da8 100644 --- a/app/views/admin/application_settings/_external_authorization_service_form.html.haml +++ b/app/views/admin/application_settings/_external_authorization_service_form.html.haml @@ -22,29 +22,29 @@ = link_to sprite_icon('question-o'), help_page_path('user/admin_area/settings/external_authorization') .form-group = f.label :external_authorization_service_url, _('Service URL'), class: 'label-bold' - = f.text_field :external_authorization_service_url, class: 'form-control' + = f.text_field :external_authorization_service_url, class: 'form-control gl-form-input' %span.form-text.text-muted = external_authorization_url_help_text .form-group = f.label :external_authorization_service_timeout, _('External authorization request timeout'), class: 'label-bold' - = f.number_field :external_authorization_service_timeout, class: 'form-control', min: 0.001, max: 10, step: 0.001 + = f.number_field :external_authorization_service_timeout, class: 'form-control gl-form-input', min: 0.001, max: 10, step: 0.001 %span.form-text.text-muted = external_authorization_timeout_help_text = f.label :external_auth_client_cert, _('Client authentication certificate'), class: 'label-bold' - = f.text_area :external_auth_client_cert, class: 'form-control' + = f.text_area :external_auth_client_cert, class: 'form-control gl-form-input' %span.form-text.text-muted = external_authorization_client_certificate_help_text .form-group = f.label :external_auth_client_key, _('Client authentication key'), class: 'label-bold' - = f.text_area :external_auth_client_key, class: 'form-control' + = f.text_area :external_auth_client_key, class: 'form-control gl-form-input' %span.form-text.text-muted = external_authorization_client_key_help_text .form-group = f.label :external_auth_client_key_pass, _('Client authentication key password'), class: 'label-bold' - = f.password_field :external_auth_client_key_pass, class: 'form-control' + = f.password_field :external_auth_client_key_pass, class: 'form-control gl-form-input' %span.form-text.text-muted = external_authorization_client_pass_help_text .form-group = f.label :external_authorization_service_default_label, _('Default classification label'), class: 'label-bold' - = f.text_field :external_authorization_service_default_label, class: 'form-control' + = f.text_field :external_authorization_service_default_label, class: 'form-control gl-form-input' = f.submit 'Save changes', class: "gl-button btn btn-success" diff --git a/app/views/admin/application_settings/_gitaly.html.haml b/app/views/admin/application_settings/_gitaly.html.haml index a0cd70b4d7cbb18ce7c1712f6c5f72ced4dcd194..56ec35d9329de7ed771f2472f7423713270fc1e4 100644 --- a/app/views/admin/application_settings/_gitaly.html.haml +++ b/app/views/admin/application_settings/_gitaly.html.haml @@ -4,7 +4,7 @@ %fieldset .form-group = f.label :gitaly_timeout_default, 'Default Timeout Period', class: 'label-bold' - = f.number_field :gitaly_timeout_default, class: 'form-control' + = f.number_field :gitaly_timeout_default, class: 'form-control gl-form-input' .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. @@ -13,14 +13,14 @@ the worker. .form-group = f.label :gitaly_timeout_fast, 'Fast Timeout Period', class: 'label-bold' - = f.number_field :gitaly_timeout_fast, class: 'form-control' + = f.number_field :gitaly_timeout_fast, class: 'form-control gl-form-input' .form-text.text-muted 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 = f.label :gitaly_timeout_medium, 'Medium Timeout Period', class: 'label-bold' - = f.number_field :gitaly_timeout_medium, class: 'form-control' + = f.number_field :gitaly_timeout_medium, class: 'form-control gl-form-input' .form-text.text-muted Medium operation timeout (in seconds). This should be a value between the Fast and the Default timeout. diff --git a/app/views/admin/application_settings/_gitpod.html.haml b/app/views/admin/application_settings/_gitpod.html.haml index 7f78cce45758cff8ac9fa1bc0eadb0e29fc7b622..cca81136bb924ccf9cb8a91c2c60920ebfcb6550 100644 --- a/app/views/admin/application_settings/_gitpod.html.haml +++ b/app/views/admin/application_settings/_gitpod.html.haml @@ -22,7 +22,7 @@ = f.label :gitpod_enabled, s_('Gitpod|Enable Gitpod integration'), class: 'form-check-label' .form-group = f.label :gitpod_url, s_('Gitpod|Gitpod URL'), class: 'label-bold' - = f.text_field :gitpod_url, class: 'form-control', placeholder: s_('Gitpod|e.g. https://gitpod.example.com') + = f.text_field :gitpod_url, class: 'form-control gl-form-input', placeholder: s_('Gitpod|e.g. https://gitpod.example.com') .form-text.text-muted = s_('Gitpod|Add the URL to your Gitpod instance configured to read your GitLab projects.') = f.submit s_('Save changes'), class: 'gl-button btn btn-success' diff --git a/app/views/admin/application_settings/_grafana.html.haml b/app/views/admin/application_settings/_grafana.html.haml index bd2b20943111a2b27092dbcc243ddbc8038a27cc..368b4db454993ad2adbe4ebaa1b6583f5d31cfcb 100644 --- a/app/views/admin/application_settings/_grafana.html.haml +++ b/app/views/admin/application_settings/_grafana.html.haml @@ -12,6 +12,6 @@ = _('Enable access to Grafana') .form-group = f.label :grafana_url, _('Grafana URL'), class: 'label-bold' - = f.text_field :grafana_url, class: 'form-control', placeholder: '/-/grafana' + = f.text_field :grafana_url, class: 'form-control gl-form-input', placeholder: '/-/grafana' = f.submit _('Save changes'), class: "gl-button btn btn-success" diff --git a/app/views/admin/application_settings/_help_page.html.haml b/app/views/admin/application_settings/_help_page.html.haml index fc31f612b8c134f89dd16ca39709f1b3757376c8..858df44bd98a1822631467e2ea1e893f495038e6 100644 --- a/app/views/admin/application_settings/_help_page.html.haml +++ b/app/views/admin/application_settings/_help_page.html.haml @@ -6,7 +6,7 @@ .form-group = f.label :help_page_text, class: 'label-bold' - = f.text_area :help_page_text, class: 'form-control', rows: 4 + = f.text_area :help_page_text, class: 'form-control gl-form-input', rows: 4 .form-text.text-muted= _('Markdown enabled') .form-group .form-check @@ -15,12 +15,12 @@ = _('Hide marketing-related entries from help') .form-group = f.label :help_page_support_url, _('Support page URL'), class: 'label-bold' - = f.text_field :help_page_support_url, class: 'form-control', placeholder: 'http://company.example.com/getting-help', :'aria-describedby' => 'support_help_block' + = f.text_field :help_page_support_url, class: 'form-control gl-form-input', placeholder: 'http://company.example.com/getting-help', :'aria-describedby' => 'support_help_block' %span.form-text.text-muted#support_help_block= _('Alternate support URL for help page and help dropdown') - if show_documentation_base_url_field? .form-group = f.label :help_page_documentation_base_url, _('Documentation pages URL'), class: 'label-bold' - = f.text_field :help_page_documentation_base_url, class: 'form-control', placeholder: 'https://docs.gitlab.com' + = f.text_field :help_page_documentation_base_url, class: 'form-control gl-form-input', placeholder: 'https://docs.gitlab.com' = f.submit _('Save changes'), class: "gl-button btn btn-success" diff --git a/app/views/admin/application_settings/_import_export_limits.html.haml b/app/views/admin/application_settings/_import_export_limits.html.haml index 58218a412823e74f586c41f6006b8cd9ad205578..e1a58c888a5652216182659d6643c9f081fd5ecd 100644 --- a/app/views/admin/application_settings/_import_export_limits.html.haml +++ b/app/views/admin/application_settings/_import_export_limits.html.haml @@ -4,31 +4,31 @@ %fieldset .form-group = f.label :project_import_limit, _('Max Project Import requests per minute per user'), class: 'label-bold' - = f.number_field :project_import_limit, class: 'form-control' + = f.number_field :project_import_limit, class: 'form-control gl-form-input' %fieldset .form-group = f.label :project_export_limit, _('Max Project Export requests per minute per user'), class: 'label-bold' - = f.number_field :project_export_limit, class: 'form-control' + = f.number_field :project_export_limit, class: 'form-control gl-form-input' %fieldset .form-group = f.label :project_download_export_limit, _('Max Project Export Download requests per minute per user'), class: 'label-bold' - = f.number_field :project_download_export_limit, class: 'form-control' + = f.number_field :project_download_export_limit, class: 'form-control gl-form-input' %fieldset .form-group = f.label :group_import_limit, _('Max Group Import requests per minute per user'), class: 'label-bold' - = f.number_field :group_import_limit, class: 'form-control' + = f.number_field :group_import_limit, class: 'form-control gl-form-input' %fieldset .form-group = f.label :group_export_limit, _('Max Group Export requests per minute per user'), class: 'label-bold' - = f.number_field :group_export_limit, class: 'form-control' + = f.number_field :group_export_limit, class: 'form-control gl-form-input' %fieldset .form-group = f.label :group_download_export_limit, _('Max Group Export Download requests per minute per user'), class: 'label-bold' - = f.number_field :group_download_export_limit, class: 'form-control' + = f.number_field :group_download_export_limit, class: 'form-control gl-form-input' = f.submit 'Save changes', class: "gl-button btn btn-success", data: { qa_selector: 'save_changes_button' } diff --git a/app/views/admin/application_settings/_initial_branch_name.html.haml b/app/views/admin/application_settings/_initial_branch_name.html.haml index bab841fcade671d552b9aff5ed553d238e64536b..e7718f94b90f4ed67a42e9fbfbd6bca113add654 100644 --- a/app/views/admin/application_settings/_initial_branch_name.html.haml +++ b/app/views/admin/application_settings/_initial_branch_name.html.haml @@ -6,7 +6,7 @@ %fieldset .form-group = f.label :default_branch_name, _('Default initial branch name'), class: 'label-light' - = f.text_field :default_branch_name, placeholder: 'master', class: 'form-control' + = f.text_field :default_branch_name, placeholder: 'master', class: 'form-control gl-form-input' %span.form-text.text-muted = (_("Changes affect new repositories only. If not specified, Git's default name %{branch_name_default} will be used.") % { branch_name_default: fallback_branch_name } ).html_safe diff --git a/app/views/admin/application_settings/_ip_limits.html.haml b/app/views/admin/application_settings/_ip_limits.html.haml index 11ffe3f56e3df04e9186586e47383c07955db472..a603eaec913cf0ee2c78e63147cc64b61f4290aa 100644 --- a/app/views/admin/application_settings/_ip_limits.html.haml +++ b/app/views/admin/application_settings/_ip_limits.html.haml @@ -13,10 +13,10 @@ Helps reduce request volume (e.g. from crawlers or abusive bots) .form-group = f.label :throttle_unauthenticated_requests_per_period, 'Max unauthenticated requests per period per IP', class: 'label-bold' - = f.number_field :throttle_unauthenticated_requests_per_period, class: 'form-control' + = f.number_field :throttle_unauthenticated_requests_per_period, class: 'form-control gl-form-input' .form-group = f.label :throttle_unauthenticated_period_in_seconds, 'Unauthenticated rate limit period in seconds', class: 'label-bold' - = f.number_field :throttle_unauthenticated_period_in_seconds, class: 'form-control' + = f.number_field :throttle_unauthenticated_period_in_seconds, class: 'form-control gl-form-input' %hr %h5 = _('Authenticated API request rate limit') @@ -29,10 +29,10 @@ Helps reduce request volume (e.g. from crawlers or abusive bots) .form-group = f.label :throttle_authenticated_api_requests_per_period, 'Max authenticated API requests per period per user', class: 'label-bold' - = f.number_field :throttle_authenticated_api_requests_per_period, class: 'form-control' + = f.number_field :throttle_authenticated_api_requests_per_period, class: 'form-control gl-form-input' .form-group = f.label :throttle_authenticated_api_period_in_seconds, 'Authenticated API rate limit period in seconds', class: 'label-bold' - = f.number_field :throttle_authenticated_api_period_in_seconds, class: 'form-control' + = f.number_field :throttle_authenticated_api_period_in_seconds, class: 'form-control gl-form-input' %hr %h5 = _('Authenticated web request rate limit') @@ -45,16 +45,16 @@ Helps reduce request volume (e.g. from crawlers or abusive bots) .form-group = f.label :throttle_authenticated_web_requests_per_period, 'Max authenticated web requests per period per user', class: 'label-bold' - = f.number_field :throttle_authenticated_web_requests_per_period, class: 'form-control' + = f.number_field :throttle_authenticated_web_requests_per_period, class: 'form-control gl-form-input' .form-group = f.label :throttle_authenticated_web_period_in_seconds, 'Authenticated web rate limit period in seconds', class: 'label-bold' - = f.number_field :throttle_authenticated_web_period_in_seconds, class: 'form-control' + = f.number_field :throttle_authenticated_web_period_in_seconds, class: 'form-control gl-form-input' %hr %h5 = _('Response text') .form-group = f.label :rate_limiting_response_text, class: 'label-bold' do = _('A plain-text response to show to clients that hit the rate limit.') - = f.text_area :rate_limiting_response_text, placeholder: ::Gitlab::Throttle::DEFAULT_RATE_LIMITING_RESPONSE_TEXT, class: 'form-control', rows: 5 + = f.text_area :rate_limiting_response_text, placeholder: ::Gitlab::Throttle::DEFAULT_RATE_LIMITING_RESPONSE_TEXT, class: 'form-control gl-form-input', rows: 5 = f.submit 'Save changes', class: "gl-button btn btn-success", data: { qa_selector: 'save_changes_button' } diff --git a/app/views/admin/application_settings/_issue_limits.html.haml b/app/views/admin/application_settings/_issue_limits.html.haml index 200ea3a8ec167a86c6418417fe62057d61a7e1c6..e16561b448942146e4e657aa3f8a80700ab5d9ae 100644 --- a/app/views/admin/application_settings/_issue_limits.html.haml +++ b/app/views/admin/application_settings/_issue_limits.html.haml @@ -4,6 +4,6 @@ %fieldset .form-group = f.label :issues_create_limit, 'Max requests per minute per user', class: 'label-bold' - = f.number_field :issues_create_limit, class: 'form-control' + = f.number_field :issues_create_limit, class: 'form-control gl-form-input' = f.submit 'Save changes', class: "gl-button btn btn-success", data: { qa_selector: 'save_changes_button' } diff --git a/app/views/admin/application_settings/_kroki.html.haml b/app/views/admin/application_settings/_kroki.html.haml index 1547b28c651dda1786336b2047f7dd8894d91323..23848fb8b9b02ab62b0dc16a2e6c94161aa119fd 100644 --- a/app/views/admin/application_settings/_kroki.html.haml +++ b/app/views/admin/application_settings/_kroki.html.haml @@ -18,7 +18,7 @@ = f.label :kroki_enabled, _('Enable Kroki'), class: 'form-check-label' .form-group = f.label :kroki_url, 'Kroki URL', class: 'label-bold' - = f.text_field :kroki_url, class: 'form-control', placeholder: 'http://your-kroki-instance:8000' + = f.text_field :kroki_url, class: 'form-control gl-form-input', placeholder: 'http://your-kroki-instance:8000' .form-text.text-muted = (_('When Kroki is enabled, GitLab sends diagrams to an instance of Kroki to display them as images. You can use the free public cloud instance %{kroki_public_url} or you can %{install_link} on your own infrastructure. Once you\'ve installed Kroki, make sure to update the server URL to point to your instance.') % { kroki_public_url: '<code>https://kroki.io</code>', install_link: link_to('install Kroki', 'https://docs.kroki.io/kroki/setup/install/', target: '_blank') }).html_safe diff --git a/app/views/admin/application_settings/_outbound.html.haml b/app/views/admin/application_settings/_outbound.html.haml index db0a87c366e6e849e218c1e9f7d27c67c8cc3fbb..694cc9deab6c65a4c5e12463e6ad7e971bf65021 100644 --- a/app/views/admin/application_settings/_outbound.html.haml +++ b/app/views/admin/application_settings/_outbound.html.haml @@ -15,7 +15,7 @@ .form-group = f.label :outbound_local_requests_allowlist_raw, class: 'label-bold' do = _('Local IP addresses and domain names that hooks and services may access.') - = f.text_area :outbound_local_requests_allowlist_raw, placeholder: "example.com, 192.168.1.1", class: 'form-control', rows: 8 + = f.text_area :outbound_local_requests_allowlist_raw, placeholder: "example.com, 192.168.1.1", class: 'form-control gl-form-input', rows: 8 %span.form-text.text-muted = _('Requests to these domain(s)/address(es) on the local network will be allowed when local requests from hooks and services are not allowed. IP ranges such as 1:0:0:0:0:0:0:0/124 or 127.0.0.0/28 are supported. Domain wildcards are not supported currently. Use comma, semicolon, or newline to separate multiple entries. The allowlist can hold a maximum of 1000 entries. Domains should use IDNA encoding. Ex: example.com, 192.168.1.1, 127.0.0.0/28, xn--itlab-j1a.com.') diff --git a/app/views/admin/application_settings/_package_registry.html.haml b/app/views/admin/application_settings/_package_registry.html.haml index 8c956a43e222de548b886ffc809bdf861a992978..86df1aa6e026916368db7578a698e749608902bf 100644 --- a/app/views/admin/application_settings/_package_registry.html.haml +++ b/app/views/admin/application_settings/_package_registry.html.haml @@ -31,20 +31,20 @@ = f.hidden_field(:plan_id, value: plan.id) .form-group = f.label :conan_max_file_size, _('Maximum Conan package file size in bytes'), class: 'label-bold' - = f.number_field :conan_max_file_size, class: 'form-control' + = f.number_field :conan_max_file_size, class: 'form-control gl-form-input' .form-group = f.label :maven_max_file_size, _('Maximum Maven package file size in bytes'), class: 'label-bold' - = f.number_field :maven_max_file_size, class: 'form-control' + = f.number_field :maven_max_file_size, class: 'form-control gl-form-input' .form-group = f.label :npm_max_file_size, _('Maximum NPM package file size in bytes'), class: 'label-bold' - = f.number_field :npm_max_file_size, class: 'form-control' + = f.number_field :npm_max_file_size, class: 'form-control gl-form-input' .form-group = f.label :nuget_max_file_size, _('Maximum NuGet package file size in bytes'), class: 'label-bold' - = f.number_field :nuget_max_file_size, class: 'form-control' + = f.number_field :nuget_max_file_size, class: 'form-control gl-form-input' .form-group = f.label :pypi_max_file_size, _('Maximum PyPI package file size in bytes'), class: 'label-bold' - = f.number_field :pypi_max_file_size, class: 'form-control' + = f.number_field :pypi_max_file_size, class: 'form-control gl-form-input' .form-group = f.label :generic_packages_max_file_size, _('Generic package file size in bytes'), class: 'label-bold' - = f.number_field :generic_packages_max_file_size, class: 'form-control' + = f.number_field :generic_packages_max_file_size, class: 'form-control gl-form-input' = f.submit _('Save %{name} size limits').html_safe % { name: plan.name.capitalize }, class: 'btn gl-button btn-success' diff --git a/app/views/admin/application_settings/_pages.html.haml b/app/views/admin/application_settings/_pages.html.haml index d42987eb7d8c70e761c653e9791b108a8437e781..503aae861d046efda9516d226c16bf3b5d9b69af 100644 --- a/app/views/admin/application_settings/_pages.html.haml +++ b/app/views/admin/application_settings/_pages.html.haml @@ -4,7 +4,7 @@ %fieldset .form-group = f.label :max_pages_size, 'Maximum size of pages (MB)', class: 'label-bold' - = f.number_field :max_pages_size, class: 'form-control' + = f.number_field :max_pages_size, class: 'form-control gl-form-input' .form-text.text-muted = _("0 for unlimited") .form-group @@ -31,7 +31,7 @@ = _("%{lets_encrypt_link_start}Let's Encrypt%{lets_encrypt_link_end} is a free, automated, and open certificate authority (CA), that give digital certificates in order to enable HTTPS (SSL/TLS) for websites.").html_safe % { lets_encrypt_link_start: lets_encrypt_link_start, lets_encrypt_link_end: '</a>'.html_safe } .form-group = f.label :lets_encrypt_notification_email, _("Email"), class: 'label-bold' - = f.text_field :lets_encrypt_notification_email, class: 'form-control' + = f.text_field :lets_encrypt_notification_email, class: 'form-control gl-form-input' .form-text.text-muted = _("A Let's Encrypt account will be configured for this GitLab installation using your email address. You will receive emails to warn of expiring certificates.") .form-group diff --git a/app/views/admin/application_settings/_performance.html.haml b/app/views/admin/application_settings/_performance.html.haml index 2d27bceef10b242e4d98acb23a5050298e71bd3c..3efe163de7bd5c371e9489533352b8997bd2e581 100644 --- a/app/views/admin/application_settings/_performance.html.haml +++ b/app/views/admin/application_settings/_performance.html.haml @@ -17,17 +17,17 @@ .form-group = f.label :raw_blob_request_limit, _('Raw blob request rate limit per minute'), class: 'label-bold' - = f.number_field :raw_blob_request_limit, class: 'form-control' + = f.number_field :raw_blob_request_limit, class: 'form-control gl-form-input' .form-text.text-muted = _('Highest number of requests per minute for each raw path, default to 300. To disable throttling set to 0.') .form-group = f.label :push_event_hooks_limit, class: 'label-bold' - = f.number_field :push_event_hooks_limit, class: 'form-control' + = f.number_field :push_event_hooks_limit, class: 'form-control gl-form-input' .form-text.text-muted = _("Number of changes (branches or tags) in a single push to determine whether webhooks and services will be fired or not. Webhooks and services won't be submitted if it surpasses that value.") .form-group = f.label :push_event_activities_limit, class: 'label-bold' - = f.number_field :push_event_activities_limit, class: 'form-control' + = f.number_field :push_event_activities_limit, class: 'form-control gl-form-input' .form-text.text-muted = _('Number of changes (branches or tags) in a single push to determine whether individual push events or bulk push event will be created. Bulk push event will be created if it surpasses that value.') diff --git a/app/views/admin/application_settings/_performance_bar.html.haml b/app/views/admin/application_settings/_performance_bar.html.haml index 1036cc94bd0d793976479c6d2f4a340ea7b4284a..2db2255259666d92f95f6b2277f7b159e6860243 100644 --- a/app/views/admin/application_settings/_performance_bar.html.haml +++ b/app/views/admin/application_settings/_performance_bar.html.haml @@ -9,6 +9,6 @@ Enable access to the Performance Bar .form-group = f.label :performance_bar_allowed_group_path, 'Allowed group', class: 'label-bold' - = f.text_field :performance_bar_allowed_group_path, class: 'form-control', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path + = f.text_field :performance_bar_allowed_group_path, class: 'form-control gl-form-input', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path = f.submit 'Save changes', class: 'gl-button btn btn-success qa-save-changes-button' diff --git a/app/views/admin/application_settings/_plantuml.html.haml b/app/views/admin/application_settings/_plantuml.html.haml index 77a310c73a8c714798240fc14f8d4463adab0c50..93fcc90f044f244a79a6142af129ba54c7752d2b 100644 --- a/app/views/admin/application_settings/_plantuml.html.haml +++ b/app/views/admin/application_settings/_plantuml.html.haml @@ -18,7 +18,7 @@ = f.label :plantuml_enabled, _('Enable PlantUML'), class: 'form-check-label' .form-group = f.label :plantuml_url, 'PlantUML URL', class: 'label-bold' - = f.text_field :plantuml_url, class: 'form-control', placeholder: 'http://your-plantuml-instance:8080' + = f.text_field :plantuml_url, class: 'form-control gl-form-input', placeholder: 'http://your-plantuml-instance:8080' .form-text.text-muted Allow rendering of = link_to "PlantUML", "http://plantuml.com" diff --git a/app/views/admin/application_settings/_prometheus.html.haml b/app/views/admin/application_settings/_prometheus.html.haml index c571ec1c1b02cadd23bb49afbe5d89d75fa07785..c394bc650462edf1e7be21fedba3772b4430677b 100644 --- a/app/views/admin/application_settings/_prometheus.html.haml +++ b/app/views/admin/application_settings/_prometheus.html.haml @@ -25,7 +25,7 @@ = link_to sprite_icon('question-o'), help_page_path('administration/monitoring/prometheus/gitlab_metrics', anchor: 'metrics-shared-directory') .form-group = f.label :metrics_method_call_threshold, 'Method Call Threshold (ms)', class: 'label-bold' - = f.number_field :metrics_method_call_threshold, class: 'form-control' + = f.number_field :metrics_method_call_threshold, class: 'form-control gl-form-input' .form-text.text-muted A method call is only tracked when it takes longer to complete than the given amount of milliseconds. diff --git a/app/views/admin/application_settings/_protected_paths.html.haml b/app/views/admin/application_settings/_protected_paths.html.haml index fce64369f17bfb64fd2e1ec8a74a1ce7516fcd80..57bba4f970aa58040a9915dd5f882a28cbed71af 100644 --- a/app/views/admin/application_settings/_protected_paths.html.haml +++ b/app/views/admin/application_settings/_protected_paths.html.haml @@ -17,15 +17,15 @@ = _('Helps reduce request volume for protected paths') .form-group = f.label :throttle_protected_paths_requests_per_period, 'Max requests per period per user', class: 'label-bold' - = f.number_field :throttle_protected_paths_requests_per_period, class: 'form-control' + = f.number_field :throttle_protected_paths_requests_per_period, class: 'form-control gl-form-input' .form-group = f.label :throttle_protected_paths_period_in_seconds, 'Rate limit period in seconds', class: 'label-bold' - = f.number_field :throttle_protected_paths_period_in_seconds, class: 'form-control' + = f.number_field :throttle_protected_paths_period_in_seconds, class: 'form-control gl-form-input' .form-group = f.label :protected_paths, class: 'label-bold' do - relative_url_link = 'https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-a-relative-url-for-gitlab' - relative_url_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: relative_url_link } = _('All paths are relative to the GitLab URL. Do not include %{relative_url_link_start}relative URL%{relative_url_link_end}.').html_safe % { relative_url_link_start: relative_url_link_start, relative_url_link_end: '</a>'.html_safe } - = f.text_area :protected_paths_raw, placeholder: '/users/sign_in,/users/password', class: 'form-control', rows: 10 + = f.text_area :protected_paths_raw, placeholder: '/users/sign_in,/users/password', class: 'form-control gl-form-input', rows: 10 = f.submit 'Save changes', class: 'gl-button btn btn-success' diff --git a/app/views/admin/application_settings/_realtime.html.haml b/app/views/admin/application_settings/_realtime.html.haml index cf0b2b53effdb4c43a890835d26837f3fdcd2ac3..2b54a15d615ef0194422adbbda6df899179d2ebb 100644 --- a/app/views/admin/application_settings/_realtime.html.haml +++ b/app/views/admin/application_settings/_realtime.html.haml @@ -4,7 +4,7 @@ %fieldset .form-group = f.label :polling_interval_multiplier, 'Polling interval multiplier', class: 'label-bold' - = f.text_field :polling_interval_multiplier, class: 'form-control' + = f.text_field :polling_interval_multiplier, class: 'form-control gl-form-input' .form-text.text-muted Change this value to influence how frequently the GitLab UI polls for updates. If you set the value to 2 all polling intervals are multiplied diff --git a/app/views/admin/application_settings/_registry.html.haml b/app/views/admin/application_settings/_registry.html.haml index dd64d0ae419b5d154170d1965c9fa730ccdc87b0..dd3bfa01fddf18e3e94cfdd1e820563450920672 100644 --- a/app/views/admin/application_settings/_registry.html.haml +++ b/app/views/admin/application_settings/_registry.html.haml @@ -4,7 +4,7 @@ %fieldset .form-group = f.label :container_registry_token_expire_delay, 'Authorization token duration (minutes)', class: 'label-bold' - = f.number_field :container_registry_token_expire_delay, class: 'form-control' + = f.number_field :container_registry_token_expire_delay, class: 'form-control gl-form-input' .form-group .form-check = f.check_box :container_expiration_policies_enable_historic_entries, class: 'form-check-input' @@ -17,7 +17,7 @@ - if limit_delete_tags_service? .form-group = f.label :container_registry_delete_tags_service_timeout, _('Cleanup policy maximum processing time (seconds)'), class: 'label-bold' - = f.number_field :container_registry_delete_tags_service_timeout, min: 0, class: 'form-control' + = f.number_field :container_registry_delete_tags_service_timeout, min: 0, class: 'form-control gl-form-input' .form-text.text-muted = _("Tags are deleted until the timeout is reached. Any remaining tags are included the next time the policy runs. To remove the time limit, set it to 0.") diff --git a/app/views/admin/application_settings/_repository_check.html.haml b/app/views/admin/application_settings/_repository_check.html.haml index b9c2e406b78f98d11e03a84ea88caf04b4b7ed11..24e74dd0f1b14e011f31cb93f04c3f95561c347c 100644 --- a/app/views/admin/application_settings/_repository_check.html.haml +++ b/app/views/admin/application_settings/_repository_check.html.haml @@ -41,17 +41,17 @@ bitmaps should accelerate 'git clone' performance. .form-group = f.label :housekeeping_incremental_repack_period, 'Incremental repack period', class: 'label-bold' - = f.number_field :housekeeping_incremental_repack_period, class: 'form-control' + = f.number_field :housekeeping_incremental_repack_period, class: 'form-control gl-form-input' .form-text.text-muted Number of Git pushes after which an incremental 'git repack' is run. .form-group = f.label :housekeeping_full_repack_period, 'Full repack period', class: 'label-bold' - = f.number_field :housekeeping_full_repack_period, class: 'form-control' + = f.number_field :housekeeping_full_repack_period, class: 'form-control gl-form-input' .form-text.text-muted Number of Git pushes after which a full 'git repack' is run. .form-group = f.label :housekeeping_gc_period, 'Git GC period', class: 'label-bold' - = f.number_field :housekeeping_gc_period, class: 'form-control' + = f.number_field :housekeeping_gc_period, class: 'form-control gl-form-input' .form-text.text-muted Number of Git pushes after which 'git gc' is run. diff --git a/app/views/admin/application_settings/_repository_static_objects.html.haml b/app/views/admin/application_settings/_repository_static_objects.html.haml index 00b9b4b8964e00c737f78b588ac104bc45d519ca..42fe2b24bb22a347f586f2537ff7ee8aa851f7f3 100644 --- a/app/views/admin/application_settings/_repository_static_objects.html.haml +++ b/app/views/admin/application_settings/_repository_static_objects.html.haml @@ -5,13 +5,13 @@ .form-group = f.label :static_objects_external_storage_url, class: 'label-bold' do = _('External storage URL') - = f.text_field :static_objects_external_storage_url, class: 'form-control' + = f.text_field :static_objects_external_storage_url, class: 'form-control gl-form-input' %span.form-text.text-muted#static_objects_external_storage_url_help_block = _('URL of the external storage that will serve the repository static objects (e.g. archives, blobs, ...).') .form-group = f.label :static_objects_external_storage_auth_token, class: 'label-bold' do = _('External storage authentication token') - = f.text_field :static_objects_external_storage_auth_token, class: 'form-control' + = f.text_field :static_objects_external_storage_auth_token, class: 'form-control gl-form-input' %span.form-text.text-muted#static_objects_external_storage_auth_token_help_block = _('A secure token that identifies an external storage request.') diff --git a/app/views/admin/application_settings/_signin.html.haml b/app/views/admin/application_settings/_signin.html.haml index 66fd0087c3ee9d92854527855ce82f023326a836..23a7856e4832f8132f82cbd5454433377b7fc67c 100644 --- a/app/views/admin/application_settings/_signin.html.haml +++ b/app/views/admin/application_settings/_signin.html.haml @@ -43,18 +43,18 @@ target: '_blank' .form-group = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'label-bold' - = f.number_field :two_factor_grace_period, min: 0, class: 'form-control', placeholder: '0' + = f.number_field :two_factor_grace_period, min: 0, class: 'form-control gl-form-input', 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 = f.label :home_page_url, 'Home page URL', class: 'label-bold' - = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block' + = f.text_field :home_page_url, class: 'form-control gl-form-input', 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 = f.label :after_sign_out_path, _('After sign-out path'), class: 'label-bold' - = f.text_field :after_sign_out_path, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'after_sign_out_path_help_block' + = f.text_field :after_sign_out_path, class: 'form-control gl-form-input', 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 = f.label :sign_in_text, _('Sign-in text'), class: 'label-bold' - = f.text_area :sign_in_text, class: 'form-control', rows: 4 + = f.text_area :sign_in_text, class: 'form-control gl-form-input', rows: 4 .form-text.text-muted Markdown enabled = f.submit 'Save changes', class: "gl-button btn btn-success" diff --git a/app/views/admin/application_settings/_signup.html.haml b/app/views/admin/application_settings/_signup.html.haml index 92477dff3d8af51fed1f20376f19d20405e3c675..82824f1d43616f91c0d002f56cf1b86eb0a6c165 100644 --- a/app/views/admin/application_settings/_signup.html.haml +++ b/app/views/admin/application_settings/_signup.html.haml @@ -26,13 +26,13 @@ .form-group = f.label :minimum_password_length, _('Minimum password length (number of characters)'), class: 'label-bold' - = f.number_field :minimum_password_length, class: 'form-control', rows: 4, min: ApplicationSetting::DEFAULT_MINIMUM_PASSWORD_LENGTH, max: Devise.password_length.max + = f.number_field :minimum_password_length, class: 'form-control gl-form-input', rows: 4, min: ApplicationSetting::DEFAULT_MINIMUM_PASSWORD_LENGTH, max: Devise.password_length.max - password_policy_guidelines_link = link_to _('Password Policy Guidelines'), 'https://about.gitlab.com/handbook/security/#gitlab-password-policy-guidelines', target: '_blank', rel: 'noopener noreferrer nofollow' .form-text.text-muted = _("See GitLab's %{password_policy_guidelines}").html_safe % { password_policy_guidelines: password_policy_guidelines_link } .form-group = f.label :domain_allowlist, _('Allowed domains for sign-ups'), class: 'label-bold' - = f.text_area :domain_allowlist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8 + = f.text_area :domain_allowlist_raw, placeholder: 'domain.com', class: 'form-control gl-form-input', 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 = f.label :domain_denylist_enabled, _('Domain denylist'), class: 'label-bold' @@ -53,11 +53,11 @@ Enter denylist manually .form-group.js-denylist-file = f.label :domain_denylist_file, _('Denylist file'), class: 'label-bold' - = f.file_field :domain_denylist_file, class: 'form-control', accept: '.txt,.conf' + = f.file_field :domain_denylist_file, class: 'form-control gl-form-input', 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.js-denylist-raw = f.label :domain_denylist, _('Denied domains for sign-ups'), class: 'label-bold' - = f.text_area :domain_denylist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8 + = f.text_area :domain_denylist_raw, placeholder: 'domain.com', class: 'form-control gl-form-input', 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 = f.label :email_restrictions_enabled, _('Email restrictions'), class: 'label-bold' @@ -67,7 +67,7 @@ = _('Enable email restrictions for sign ups') .form-group = f.label :email_restrictions, _('Email restrictions for sign-ups'), class: 'label-bold' - = f.text_area :email_restrictions, class: 'form-control', rows: 4 + = f.text_area :email_restrictions, class: 'form-control gl-form-input', rows: 4 .form-text.text-muted - supported_syntax_link_url = 'https://github.com/google/re2/wiki/Syntax' - supported_syntax_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: supported_syntax_link_url } @@ -75,6 +75,6 @@ .form-group = f.label :after_sign_up_text, class: 'label-bold' - = f.text_area :after_sign_up_text, class: 'form-control', rows: 4 + = f.text_area :after_sign_up_text, class: 'form-control gl-form-input', rows: 4 .form-text.text-muted Markdown enabled = f.submit 'Save changes', class: "gl-button btn btn-success", data: { qa_selector: 'save_changes_button' } diff --git a/app/views/admin/application_settings/_snowplow.html.haml b/app/views/admin/application_settings/_snowplow.html.haml index c1edaf9ff291d1b367d43787addb0ebfb27a41e6..5f5a3a6992c60127f507d490f59dd045f09839d3 100644 --- a/app/views/admin/application_settings/_snowplow.html.haml +++ b/app/views/admin/application_settings/_snowplow.html.haml @@ -18,12 +18,12 @@ = f.label :snowplow_enabled, _('Enable snowplow tracking'), class: 'form-check-label' .form-group = f.label :snowplow_collector_hostname, _('Collector hostname'), class: 'label-light' - = f.text_field :snowplow_collector_hostname, class: 'form-control', placeholder: 'snowplow.example.com' + = f.text_field :snowplow_collector_hostname, class: 'form-control gl-form-input', placeholder: 'snowplow.example.com' .form-group = f.label :snowplow_app_id, _('App ID'), class: 'label-light' - = f.text_field :snowplow_app_id, class: 'form-control' + = f.text_field :snowplow_app_id, class: 'form-control gl-form-input' .form-group = f.label :snowplow_cookie_domain, _('Cookie domain'), class: 'label-light' - = f.text_field :snowplow_cookie_domain, class: 'form-control' + = f.text_field :snowplow_cookie_domain, class: 'form-control gl-form-input' = f.submit _('Save changes'), class: 'gl-button btn btn-success' diff --git a/app/views/admin/application_settings/_sourcegraph.html.haml b/app/views/admin/application_settings/_sourcegraph.html.haml index 2a4e8f87c3132f84547e9a221da76940b62dc8cc..e1af269c6fd46a44eeb657b77a3652890ed9bc0d 100644 --- a/app/views/admin/application_settings/_sourcegraph.html.haml +++ b/app/views/admin/application_settings/_sourcegraph.html.haml @@ -32,7 +32,7 @@ = s_('SourcegraphAdmin|If checked, only public projects will have code intelligence and communicate with Sourcegraph.') .form-group = f.label :sourcegraph_url, s_('SourcegraphAdmin|Sourcegraph URL'), class: 'label-bold' - = f.text_field :sourcegraph_url, class: 'form-control', placeholder: s_('SourcegraphAdmin|e.g. https://sourcegraph.example.com') + = f.text_field :sourcegraph_url, class: 'form-control gl-form-input', placeholder: s_('SourcegraphAdmin|e.g. https://sourcegraph.example.com') .form-text.text-muted = s_('SourcegraphAdmin|Configure the URL to a Sourcegraph instance which can read your GitLab projects.') = f.submit s_('SourcegraphAdmin|Save changes'), class: 'gl-button btn btn-success' diff --git a/app/views/admin/application_settings/_spam.html.haml b/app/views/admin/application_settings/_spam.html.haml index 2b871d3693c489ff7dee013ba11a1f80d985d12e..6085cea4f5d637c8f1a856afa9edc3f5a33626cf 100644 --- a/app/views/admin/application_settings/_spam.html.haml +++ b/app/views/admin/application_settings/_spam.html.haml @@ -18,7 +18,7 @@ = _('Helps prevent bots from brute-force attacks.') .form-group = f.label :recaptcha_site_key, 'reCAPTCHA Site Key', class: 'label-bold' - = f.text_field :recaptcha_site_key, class: 'form-control' + = f.text_field :recaptcha_site_key, class: 'form-control gl-form-input' .form-text.text-muted Generate site and private keys at %a{ href: 'http://www.google.com/recaptcha', target: 'blank' } http://www.google.com/recaptcha @@ -26,7 +26,7 @@ .form-group = f.label :recaptcha_private_key, 'reCAPTCHA Private Key', class: 'label-bold' .form-group - = f.text_field :recaptcha_private_key, class: 'form-control' + = f.text_field :recaptcha_private_key, class: 'form-control gl-form-input' .form-group .form-check @@ -45,7 +45,7 @@ .form-group = f.label :akismet_api_key, 'Akismet API Key', class: 'label-bold' - = f.text_field :akismet_api_key, class: 'form-control' + = f.text_field :akismet_api_key, class: 'form-control gl-form-input' .form-text.text-muted Generate API key at %a{ href: 'http://www.akismet.com', target: 'blank' } http://www.akismet.com @@ -60,13 +60,13 @@ .form-group = f.label :unique_ips_limit_per_user, 'IPs per user', class: 'label-bold' - = f.number_field :unique_ips_limit_per_user, class: 'form-control' + = f.number_field :unique_ips_limit_per_user, class: 'form-control gl-form-input' .form-text.text-muted Maximum number of unique IPs per user .form-group = f.label :unique_ips_limit_time_window, 'IP expiration time', class: 'label-bold' - = f.number_field :unique_ips_limit_time_window, class: 'form-control' + = f.number_field :unique_ips_limit_time_window, class: 'form-control gl-form-input' .form-text.text-muted How many seconds an IP will be counted towards the limit @@ -77,6 +77,6 @@ .form-text.text-muted= _('Define custom rules for what constitutes spam, independent of Akismet') .form-group = f.label :spam_check_endpoint_url, _('URL of the external Spam Check endpoint'), class: 'label-bold' - = f.text_field :spam_check_endpoint_url, class: 'form-control' + = f.text_field :spam_check_endpoint_url, class: 'form-control gl-form-input' = f.submit 'Save changes', class: "gl-button btn btn-success" diff --git a/app/views/admin/application_settings/_terminal.html.haml b/app/views/admin/application_settings/_terminal.html.haml index 7bc5b2405e855acb8e9dc04b17c85111f2bcc968..8f89cf27291ffe30ef40be1006cd1477fe36c49e 100644 --- a/app/views/admin/application_settings/_terminal.html.haml +++ b/app/views/admin/application_settings/_terminal.html.haml @@ -4,7 +4,7 @@ %fieldset .form-group = f.label :terminal_max_session_time, 'Max session time', class: 'label-bold' - = f.number_field :terminal_max_session_time, class: 'form-control' + = f.number_field :terminal_max_session_time, class: 'form-control gl-form-input' .form-text.text-muted Maximum time for web terminal websocket connection (in seconds). 0 for unlimited. diff --git a/app/views/admin/application_settings/_terms.html.haml b/app/views/admin/application_settings/_terms.html.haml index 10db1e23d7b91c6d39cd32331f206de2e553d467..717b22203368db2943b3a01f3a2515a0189159d2 100644 --- a/app/views/admin/application_settings/_terms.html.haml +++ b/app/views/admin/application_settings/_terms.html.haml @@ -12,7 +12,7 @@ .form-group = f.label :terms do = _("Terms of Service Agreement and Privacy Policy") - = f.text_area :terms, class: 'form-control', rows: 8 + = f.text_area :terms, class: 'form-control gl-form-input', rows: 8 .form-text.text-muted = _("Markdown enabled") = f.submit _("Save changes"), class: "gl-button btn btn-success" 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 709ce49713235a6ded68466b3d16e756efaf9419..a4135034f0d653e955a40144c7080919523cf5ce 100644 --- a/app/views/admin/application_settings/_visibility_and_access.html.haml +++ b/app/views/admin/application_settings/_visibility_and_access.html.haml @@ -57,7 +57,7 @@ .form-group = f.label :custom_http_clone_url_root, _('Custom Git clone URL for HTTP(S)'), class: 'label-bold' - = f.text_field :custom_http_clone_url_root, class: 'form-control', placeholder: 'https://git.example.com', :'aria-describedby' => 'custom_http_clone_url_root_help_block' + = f.text_field :custom_http_clone_url_root, class: 'form-control gl-form-input', placeholder: 'https://git.example.com', :'aria-describedby' => 'custom_http_clone_url_root_help_block' %span.form-text.text-muted#custom_http_clone_url_root_help_block = _('Replaces the clone URL root.') diff --git a/changelogs/unreleased/yo-gl-input-admin-application_settings.yml b/changelogs/unreleased/yo-gl-input-admin-application_settings.yml new file mode 100644 index 0000000000000000000000000000000000000000..ff5a7b8d1e6fe6677a77d94fb29cc2da98dcfad9 --- /dev/null +++ b/changelogs/unreleased/yo-gl-input-admin-application_settings.yml @@ -0,0 +1,5 @@ +--- +title: Apply new GitLab UI for inputs in admin/application_settings directory +merge_request: 52402 +author: Yogi (@yo) +type: other diff --git a/ee/app/views/admin/application_settings/_default_project_deletion_adjourned_period_setting.html.haml b/ee/app/views/admin/application_settings/_default_project_deletion_adjourned_period_setting.html.haml index eef26f3124ae615d6a709a38dd66eeb2e401da64..619846cadd71e5aa3e9bc59fab710f75c645bd83 100644 --- a/ee/app/views/admin/application_settings/_default_project_deletion_adjourned_period_setting.html.haml +++ b/ee/app/views/admin/application_settings/_default_project_deletion_adjourned_period_setting.html.haml @@ -4,7 +4,7 @@ .form-group = f.label s_('Default deletion delay'), class: 'label-bold' - = f.select :deletion_adjourned_period, options_for_select(0..90, @application_setting.deletion_adjourned_period), {}, class: 'form-control' + = f.select :deletion_adjourned_period, options_for_select(0..90, @application_setting.deletion_adjourned_period), {}, class: 'form-control gl-form-input' = f.label :deletion_adjourned_period, class: 'form-check-label' do = _('How many days need to pass between marking entity for deletion and actual removing it.') = _('Not applicable to personal namespaced projects, which are deleted immediately on request.') diff --git a/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml b/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml index 6e9bc191a1a43a82086e12cb3a0bc3ab82a900c4..f0d67d97407a03d18aa8e30a1d83b2d8ad6e8aa3 100644 --- a/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml +++ b/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml @@ -67,53 +67,53 @@ .form-group = f.label :elasticsearch_url, 'URL', class: 'label-bold' - = f.text_field :elasticsearch_url, value: @application_setting.elasticsearch_url.join(', '), class: 'form-control', placeholder: 'http://localhost:9200', data: { qa_selector: 'url_field' } + = f.text_field :elasticsearch_url, value: @application_setting.elasticsearch_url.join(', '), class: 'form-control gl-form-input', placeholder: 'http://localhost:9200', data: { qa_selector: 'url_field' } .form-text.text-muted = _('The URL to use for connecting to Elasticsearch. Use a comma-separated list to support clustering (e.g., "http://localhost:9200, http://localhost:9201").') .form-group = f.label :elasticsearch_shards, _('Number of Elasticsearch shards'), class: 'label-bold' - = f.number_field :elasticsearch_shards, value: @application_setting.elasticsearch_shards, class: 'form-control' + = f.number_field :elasticsearch_shards, value: @application_setting.elasticsearch_shards, class: 'form-control gl-form-input' .form-text.text-muted = _('How many shards to split the Elasticsearch index over.') = recreate_index_text .form-group = f.label :elasticsearch_replicas, _('Number of Elasticsearch replicas'), class: 'label-bold' - = f.number_field :elasticsearch_replicas, value: @application_setting.elasticsearch_replicas, class: 'form-control' + = f.number_field :elasticsearch_replicas, value: @application_setting.elasticsearch_replicas, class: 'form-control gl-form-input' .form-text.text-muted = _('How many replicas each Elasticsearch shard has.') = recreate_index_text .form-group = f.label :elasticsearch_indexed_file_size_limit_kb, _('Maximum file size indexed (KiB)'), class: 'label-bold' - = f.number_field :elasticsearch_indexed_file_size_limit_kb, value: @application_setting.elasticsearch_indexed_file_size_limit_kb, class: 'form-control' + = f.number_field :elasticsearch_indexed_file_size_limit_kb, value: @application_setting.elasticsearch_indexed_file_size_limit_kb, class: 'form-control gl-form-input' .form-text.text-muted = _('Any files larger than this limit will not be indexed, and thus will not be searchable.') .form-group = f.label :elasticsearch_indexed_field_length_limit, _('Maximum field length'), class: 'label-bold' - = f.number_field :elasticsearch_indexed_field_length_limit, value: @application_setting.elasticsearch_indexed_field_length_limit, class: 'form-control' + = f.number_field :elasticsearch_indexed_field_length_limit, value: @application_setting.elasticsearch_indexed_field_length_limit, class: 'form-control gl-form-input' .form-text.text-muted = _('If any indexed field exceeds this limit it will be truncated to this number of characters and the rest will not be indexed or searchable. This does not apply to repository and wiki indexing. Setting this to 0 means it is unlimited.') .form-group = f.label :elasticsearch_max_bulk_size_mb, _('Maximum bulk request size (MiB)'), class: 'label-bold' - = f.number_field :elasticsearch_max_bulk_size_mb, value: @application_setting.elasticsearch_max_bulk_size_mb, class: 'form-control' + = f.number_field :elasticsearch_max_bulk_size_mb, value: @application_setting.elasticsearch_max_bulk_size_mb, class: 'form-control gl-form-input' .form-text.text-muted = _('Maximum size of Elasticsearch bulk indexing requests.') = _('This only applies to repository indexing operations.') .form-group = f.label :elasticsearch_max_bulk_concurrency, _('Bulk request concurrency'), class: 'label-bold' - = f.number_field :elasticsearch_max_bulk_concurrency, value: @application_setting.elasticsearch_max_bulk_concurrency, class: 'form-control' + = f.number_field :elasticsearch_max_bulk_concurrency, value: @application_setting.elasticsearch_max_bulk_concurrency, class: 'form-control gl-form-input' .form-text.text-muted = _('Maximum concurrency of Elasticsearch bulk requests per indexing operation.') = _('This only applies to repository indexing operations.') .form-group = f.label :elasticsearch_client_request_timeout, _('Client request timeout'), class: 'label-bold' - = f.number_field :elasticsearch_client_request_timeout, value: @application_setting.elasticsearch_client_request_timeout, class: 'form-control' + = f.number_field :elasticsearch_client_request_timeout, value: @application_setting.elasticsearch_client_request_timeout, class: 'form-control gl-form-input' .form-text.text-muted = _('Elasticsearch HTTP client timeout value in seconds.') = _('Setting this to 0 means using the system default timeout value.') @@ -212,20 +212,20 @@ Using AWS hosted Elasticsearch with IAM credentials .form-group = f.label :elasticsearch_aws_region, 'AWS region', class: 'label-bold' - = f.text_field :elasticsearch_aws_region, value: @application_setting.elasticsearch_aws_region, class: 'form-control' + = f.text_field :elasticsearch_aws_region, value: @application_setting.elasticsearch_aws_region, class: 'form-control gl-form-input' .form-text.text-muted = _('Region that Elasticsearch is configured') .form-group = f.label :elasticsearch_aws_access_key, _('AWS Access Key'), class: 'label-bold' - = f.text_field :elasticsearch_aws_access_key, value: @application_setting.elasticsearch_aws_access_key, class: 'form-control' + = f.text_field :elasticsearch_aws_access_key, value: @application_setting.elasticsearch_aws_access_key, class: 'form-control gl-form-input' .form-text.text-muted = _('AWS Access Key. Only required if not using role instance credentials') - secret_access_key_label = @application_setting.elasticsearch_aws_secret_access_key.present? ? _('Enter new AWS Secret Access Key') : _('AWS Secret Access Key') .form-group = f.label :elasticsearch_aws_secret_access_key, secret_access_key_label, class: 'label-bold' - = f.password_field :elasticsearch_aws_secret_access_key, autocomplete: 'new-password', class: 'form-control' + = f.password_field :elasticsearch_aws_secret_access_key, autocomplete: 'new-password', class: 'form-control gl-form-input' .form-text.text-muted = _('AWS Secret Access Key. Only required if not using role instance credentials') diff --git a/ee/app/views/admin/application_settings/_email_additional_text_setting.html.haml b/ee/app/views/admin/application_settings/_email_additional_text_setting.html.haml index 2795a5058873eb81c0206d749448534c938a48d3..c178c4630f6b75873c9f3c74284ec5fca9f1d349 100644 --- a/ee/app/views/admin/application_settings/_email_additional_text_setting.html.haml +++ b/ee/app/views/admin/application_settings/_email_additional_text_setting.html.haml @@ -4,6 +4,6 @@ .form-group = form.label :email_additional_text, _('Additional text'), class: 'label-bold' - = form.text_area :email_additional_text, class: 'form-control', maxlength: Gitlab::CurrentSettings.email_additional_text_character_limit, rows: 4, data: { qa_selector: 'additional_text_textarea_field' } + = form.text_area :email_additional_text, class: 'form-control gl-form-input', maxlength: Gitlab::CurrentSettings.email_additional_text_character_limit, rows: 4, data: { qa_selector: 'additional_text_textarea_field' } .form-text.text-muted = _('Add additional text to appear in all email communications. %{character_limit} character limit') % { character_limit: number_with_delimiter(Gitlab::CurrentSettings.email_additional_text_character_limit) } diff --git a/ee/app/views/admin/application_settings/_help_text_setting.haml b/ee/app/views/admin/application_settings/_help_text_setting.haml index 44b65d4695bc1bd430cf24809a114d0628e15221..ecdcb28ade45b54ba2a9453ecc676d4b8cd42690 100644 --- a/ee/app/views/admin/application_settings/_help_text_setting.haml +++ b/ee/app/views/admin/application_settings/_help_text_setting.haml @@ -2,5 +2,5 @@ .form-group = form.label :help_text, class: 'label-bold' - = form.text_area :help_text, class: 'form-control', rows: 4 + = form.text_area :help_text, class: 'form-control gl-form-input', rows: 4 .form-text.text-muted= _('Markdown enabled') diff --git a/ee/app/views/admin/application_settings/_mirror_settings.html.haml b/ee/app/views/admin/application_settings/_mirror_settings.html.haml index b517a1f740b4ed8191a3af08eb9f76b5f48bb094..14184ff98b17ad09daa5cf1cce201ac69a337389 100644 --- a/ee/app/views/admin/application_settings/_mirror_settings.html.haml +++ b/ee/app/views/admin/application_settings/_mirror_settings.html.haml @@ -5,18 +5,18 @@ .form-group = form.label :mirror_max_delay, class: 'label-bold' do = _('Maximum delay (Minutes)') - = form.number_field :mirror_max_delay, class: 'form-control', min: 0 + = form.number_field :mirror_max_delay, class: 'form-control gl-form-input', min: 0 %span.form-text.text-muted#mirror_max_delay_help_block = _('Maximum time between updates that a mirror can have when scheduled to synchronize.') .form-group = form.label :mirror_max_capacity, class: 'label-bold' do = _('Maximum capacity') - = form.number_field :mirror_max_capacity, class: 'form-control', min: 0 + = form.number_field :mirror_max_capacity, class: 'form-control gl-form-input', min: 0 %span.form-text.text-muted#mirror_max_capacity_help_block = _('Maximum number of mirrors that can be synchronizing at the same time.') .form-group = form.label :mirror_capacity_threshold, class: 'label-bold' do = _('Capacity threshold') - = form.number_field :mirror_capacity_threshold, class: 'form-control', min: 0 + = form.number_field :mirror_capacity_threshold, class: 'form-control gl-form-input', min: 0 %span.form-text.text-muted#mirror_capacity_threshold = _('Minimum capacity to be available before we schedule more mirrors preemptively.') diff --git a/ee/app/views/admin/application_settings/_network_incident_management.html.haml b/ee/app/views/admin/application_settings/_network_incident_management.html.haml index 95e1e0f4e826393e8d5912842b1afff87ce1e7e9..b2d7fb82f690492ce8f8eab28bf015ac05b28e98 100644 --- a/ee/app/views/admin/application_settings/_network_incident_management.html.haml +++ b/ee/app/views/admin/application_settings/_network_incident_management.html.haml @@ -11,9 +11,9 @@ = _('Helps reduce alert volume (e.g. if creating too many issues)') .form-group = f.label :throttle_incident_management_notification_period_in_seconds, 'Max requests per period per project', class: 'label-bold' - = f.number_field :throttle_incident_management_notification_period_in_seconds, class: 'form-control' + = f.number_field :throttle_incident_management_notification_period_in_seconds, class: 'form-control gl-form-input' .form-group = f.label :throttle_incident_management_notification_per_period, 'Rate limit period in seconds', class: 'label-bold' - = f.number_field :throttle_incident_management_notification_per_period, class: 'form-control' + = f.number_field :throttle_incident_management_notification_per_period, class: 'form-control gl-form-input' = f.submit 'Save changes', class: "gl-button btn btn-success" diff --git a/ee/app/views/admin/application_settings/_new_user_signups_cap.html.haml b/ee/app/views/admin/application_settings/_new_user_signups_cap.html.haml index 7b99d580edd8c47bd313663c32f5c2cbf6de5ed3..e01606ad071624b63664dcd7ed00e0dcb5fcb671 100644 --- a/ee/app/views/admin/application_settings/_new_user_signups_cap.html.haml +++ b/ee/app/views/admin/application_settings/_new_user_signups_cap.html.haml @@ -2,6 +2,6 @@ .form-group = form.label :new_user_signups_cap, s_('AdminArea|User cap'), class: 'label-bold' - = form.number_field :new_user_signups_cap, class: 'form-control', max: License.current&.restricted_user_count + = form.number_field :new_user_signups_cap, class: 'form-control gl-form-input', max: License.current&.restricted_user_count .form-text.text-muted = s_('AdminArea|Once the instance reaches the user cap, any user who is added or requests access will have to be approved by an admin. Leave the field empty for unlimited.') diff --git a/ee/app/views/admin/application_settings/_personal_access_token_expiration_policy.html.haml b/ee/app/views/admin/application_settings/_personal_access_token_expiration_policy.html.haml index 9b0862b510cbf2f3b1b055192273ae3e2c93b9c4..320319b5d906da63714927aa7ef58effb68d6334 100644 --- a/ee/app/views/admin/application_settings/_personal_access_token_expiration_policy.html.haml +++ b/ee/app/views/admin/application_settings/_personal_access_token_expiration_policy.html.haml @@ -3,5 +3,5 @@ .form-group = form.label :max_personal_access_token_lifetime, _('Maximum allowable lifetime for personal access token (days)'), class: 'label-light' - = form.number_field :max_personal_access_token_lifetime, class: 'form-control input-xs' + = form.number_field :max_personal_access_token_lifetime, class: 'form-control gl-form-input input-xs' %span.form-text.text-muted#max_personal_access_token_lifetime= _('Leave blank for no limit. Once set, existing personal access tokens may be revoked.') diff --git a/ee/app/views/admin/application_settings/_repository_size_limit_setting.html.haml b/ee/app/views/admin/application_settings/_repository_size_limit_setting.html.haml index 2e5408dc7b20981108f0c56a5232740f1382e411..def4cf80194900f3536e0b593da5a96873dfaa10 100644 --- a/ee/app/views/admin/application_settings/_repository_size_limit_setting.html.haml +++ b/ee/app/views/admin/application_settings/_repository_size_limit_setting.html.haml @@ -5,7 +5,7 @@ .form-group = form.label :repository_size_limit, class: 'label-bold' do = _('Size limit per repository (MB)') - = form.number_field :repository_size_limit, value: form.object.repository_size_limit.try(:to_mb), class: 'form-control', min: 0, title: _('Maximum size limit for each repository.'), data: { toggle: 'tooltip', container: 'body' } + = form.number_field :repository_size_limit, value: form.object.repository_size_limit.try(:to_mb), class: 'form-control gl-form-input', min: 0, title: _('Maximum size limit for each repository.'), data: { toggle: 'tooltip', container: 'body' } %span.form-text.text-muted#repository_size_limit_help_block = _('Includes LFS objects. It can be overridden per group, or per project. 0 for unlimited.') = link_to sprite_icon('question-o'), help_page_path('user/admin_area/settings/account_and_limit_settings') diff --git a/ee/app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml b/ee/app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml index bdbf3eef9dbfc2f28a57336a737d9e62d8f91e0b..9459b0ad5d8a2afba8b22fb28ff936e9df1df2bf 100644 --- a/ee/app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml +++ b/ee/app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml @@ -1,6 +1,6 @@ .form-group = form.label :shared_runners_minutes, _('Pipeline minutes quota'), class: 'label-bold' - = form.number_field :shared_runners_minutes, class: 'form-control' + = form.number_field :shared_runners_minutes, class: 'form-control gl-form-input' .form-text.text-muted = _('Set the maximum number of pipeline minutes that a group can use on shared Runners per month. 0 for unlimited.') = link_to sprite_icon('question-o'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'shared-runners-pipeline-minutes-quota'), target: '_blank' diff --git a/ee/app/views/admin/application_settings/_slack.html.haml b/ee/app/views/admin/application_settings/_slack.html.haml index 531f635952cb4cc3fef8e14cbc4ddea4c86f7a4c..e94929b16af19346f898ebf5cb5df950d544b972 100644 --- a/ee/app/views/admin/application_settings/_slack.html.haml +++ b/ee/app/views/admin/application_settings/_slack.html.haml @@ -23,12 +23,12 @@ = _('This option is only available on GitLab.com') .form-group = f.label :slack_app_id, 'APP_ID', class: 'label-bold' - = f.text_field :slack_app_id, class: 'form-control' + = f.text_field :slack_app_id, class: 'form-control gl-form-input' .form-group = f.label :slack_app_secret, 'APP_SECRET', class: 'label-bold' - = f.text_field :slack_app_secret, class: 'form-control' + = f.text_field :slack_app_secret, class: 'form-control gl-form-input' .form-group = f.label :slack_app_verification_token, 'Verification token', class: 'label-bold' - = f.text_field :slack_app_verification_token, class: 'form-control' + = f.text_field :slack_app_verification_token, class: 'form-control gl-form-input' = f.submit _('Save changes'), class: "gl-button btn btn-success"