Skip to content

G
gitlab-ce
Commit 9bc18e56 authored by Kushal Pandya's avatar Kushal Pandya
Browse files
Options

Merge branch 'application-settings-regex-button-update' into 'master' 

Adds the gitlab-ui button classes to the application settings dir

See merge request gitlab-org/gitlab!44989
parents 57851cfd 8f635678
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 48 deletions
app/views/admin/application_settings/_abuse.html.haml
View file @ 9bc18e56
......@@ -8,4 +8,4 @@
.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.
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
app/views/admin/application_settings/_account_and_limit.html.haml
View file @ 9bc18e56
......@@ -60,4 +60,4 @@
= render_if_exists 'admin/application_settings/updating_name_disabled_for_users', form: f
= render_if_exists 'admin/application_settings/availability_on_namespace_setting', form: f
= f.submit _('Save changes'), class: 'btn btn-success qa-save-changes-button'
= f.submit _('Save changes'), class: 'gl-button btn btn-success qa-save-changes-button'
app/views/admin/application_settings/_ci_cd.html.haml
View file @ 9bc18e56
......@@ -60,4 +60,4 @@
= _("The default CI configuration path for new projects.").html_safe
= link_to sprite_icon('question-o'), help_page_path('ci/pipelines/settings', anchor: 'custom-ci-configuration-path'), target: '_blank'
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
app/views/admin/application_settings/_diff_limits.html.haml
View file @ 9bc18e56
......@@ -12,4 +12,4 @@
= link_to sprite_icon('question-o'),
help_page_path('user/admin_area/diff_limits',
anchor: 'maximum-diff-patch-size')
= f.submit _('Save changes'), class: 'btn btn-success'
= f.submit _('Save changes'), class: 'gl-button btn btn-success'
app/views/admin/application_settings/_eks.html.haml
View file @ 9bc18e56
......@@ -28,4 +28,4 @@
= 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.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
app/views/admin/application_settings/_email.html.haml
View file @ 9bc18e56
......@@ -25,4 +25,4 @@
= render_if_exists 'admin/application_settings/email_additional_text_setting', form: f
= f.submit _('Save changes'), class: "btn btn-success", data: { qa_selector: 'save_changes_button' }
= f.submit _('Save changes'), class: "gl-button btn btn-success", data: { qa_selector: 'save_changes_button' }
app/views/admin/application_settings/_external_authorization_service_form.html.haml
View file @ 9bc18e56
......@@ -47,4 +47,4 @@
.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.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
app/views/admin/application_settings/_gitaly.html.haml
View file @ 9bc18e56
......@@ -24,4 +24,4 @@
.form-text.text-muted
Medium operation timeout (in seconds). This should be a value between the Fast and the Default timeout.
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
app/views/admin/application_settings/_gitpod.html.haml
View file @ 9bc18e56
......@@ -26,4 +26,4 @@
= f.text_field :gitpod_url, class: 'form-control', 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: 'btn btn-success'
= f.submit s_('Save changes'), class: 'gl-button btn btn-success'
app/views/admin/application_settings/_grafana.html.haml
View file @ 9bc18e56
......@@ -14,4 +14,4 @@
= f.label :grafana_url, _('Grafana URL'), class: 'label-bold'
= f.text_field :grafana_url, class: 'form-control', placeholder: '/-/grafana'
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
app/views/admin/application_settings/_help_page.html.haml
View file @ 9bc18e56
......@@ -23,4 +23,4 @@
= 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.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
app/views/admin/application_settings/_import_export_limits.html.haml
View file @ 9bc18e56
......@@ -31,4 +31,4 @@
= 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.submit 'Save changes', class: "btn btn-success", data: { qa_selector: 'save_changes_button' }
= f.submit 'Save changes', class: "gl-button btn btn-success", data: { qa_selector: 'save_changes_button' }
app/views/admin/application_settings/_ip_limits.html.haml
View file @ 9bc18e56
......@@ -42,4 +42,4 @@
= f.label :throttle_authenticated_web_period_in_seconds, 'Rate limit period in seconds', class: 'label-bold'
= f.number_field :throttle_authenticated_web_period_in_seconds, class: 'form-control'
= f.submit 'Save changes', class: "btn btn-success", data: { qa_selector: 'save_changes_button' }
= f.submit 'Save changes', class: "gl-button btn btn-success", data: { qa_selector: 'save_changes_button' }
app/views/admin/application_settings/_issue_limits.html.haml
View file @ 9bc18e56
......@@ -6,4 +6,4 @@
= f.label :issues_create_limit, 'Max requests per minute per user', class: 'label-bold'
= f.number_field :issues_create_limit, class: 'form-control'
= f.submit 'Save changes', class: "btn btn-success", data: { qa_selector: 'save_changes_button' }
= f.submit 'Save changes', class: "gl-button btn btn-success", data: { qa_selector: 'save_changes_button' }
app/views/admin/application_settings/_localization.html.haml
View file @ 9bc18e56
......@@ -15,4 +15,4 @@
= f.label :time_tracking_limit_to_hours, class: 'form-check-label' do
= _('Limit display of time tracking units to hours.')
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
app/views/admin/application_settings/_outbound.html.haml
View file @ 9bc18e56
......@@ -27,4 +27,4 @@
%span.form-text.text-muted
= _('Resolves IP addresses once and uses them to submit requests')
= f.submit 'Save changes', class: "btn btn-success", data: { qa_selector: 'save_changes_button' }
= f.submit 'Save changes', class: "gl-button btn btn-success", data: { qa_selector: 'save_changes_button' }
app/views/admin/application_settings/_pages.html.haml
View file @ 9bc18e56
......@@ -41,4 +41,4 @@
- terms_of_service_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: lets_encrypt_terms_of_service_admin_application_settings_path }
= _("I have read and agree to the Let's Encrypt %{link_start}Terms of Service%{link_end} (PDF)").html_safe % { link_start: terms_of_service_link_start, link_end: '</a>'.html_safe }
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
app/views/admin/application_settings/_performance.html.haml
View file @ 9bc18e56
......@@ -31,4 +31,4 @@
.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.')
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
app/views/admin/application_settings/_performance_bar.html.haml
View file @ 9bc18e56
......@@ -11,4 +11,4 @@
= 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.submit 'Save changes', class: 'btn btn-success qa-save-changes-button'
= f.submit 'Save changes', class: 'gl-button btn btn-success qa-save-changes-button'
app/views/admin/application_settings/_plantuml.html.haml
View file @ 9bc18e56
......@@ -24,4 +24,4 @@
= link_to "PlantUML", "http://plantuml.com"
diagrams in Asciidoc documents using an external PlantUML service.
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
app/views/admin/application_settings/_prometheus.html.haml
View file @ 9bc18e56
......@@ -30,4 +30,4 @@
A method call is only tracked when it takes longer to complete than
the given amount of milliseconds.
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
app/views/admin/application_settings/_protected_paths.html.haml
View file @ 9bc18e56
......@@ -28,4 +28,4 @@
= _('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.submit 'Save changes', class: 'btn btn-success'
= f.submit 'Save changes', class: 'gl-button btn btn-success'
app/views/admin/application_settings/_realtime.html.haml
View file @ 9bc18e56
......@@ -14,4 +14,4 @@
installations. Set to 0 to completely disable polling.
= link_to sprite_icon('question-o'), help_page_path('administration/polling')
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
app/views/admin/application_settings/_registry.html.haml
View file @ 9bc18e56
......@@ -21,4 +21,4 @@
.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.")
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
app/views/admin/application_settings/_repository_check.html.haml
View file @ 9bc18e56
......@@ -55,4 +55,4 @@
.form-text.text-muted
Number of Git pushes after which 'git gc' is run.
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
app/views/admin/application_settings/_repository_mirrors_form.html.haml
View file @ 9bc18e56
......@@ -14,4 +14,4 @@
= render_if_exists 'admin/application_settings/mirror_settings', form: f
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
app/views/admin/application_settings/_repository_static_objects.html.haml
View file @ 9bc18e56
......@@ -15,4 +15,4 @@
%span.form-text.text-muted#static_objects_external_storage_auth_token_help_block
= _('A secure token that identifies an external storage request.')
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
app/views/admin/application_settings/_repository_storage.html.haml
View file @ 9bc18e56
......@@ -22,4 +22,4 @@
= f.text_field attribute[:name], class: 'form-text-input', value: attribute[:value]
= f.label attribute[:label], attribute[:label], class: 'label-bold form-check-label'
%br
= f.submit _('Save changes'), class: "btn btn-success qa-save-changes-button"
= f.submit _('Save changes'), class: "gl-button btn btn-success qa-save-changes-button"
app/views/admin/application_settings/_signin.html.haml
View file @ 9bc18e56
......@@ -57,4 +57,4 @@
= f.label :sign_in_text, class: 'label-bold'
= f.text_area :sign_in_text, class: 'form-control', rows: 4
.form-text.text-muted Markdown enabled
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
app/views/admin/application_settings/_signup.html.haml
View file @ 9bc18e56
......@@ -75,4 +75,4 @@
= f.label :after_sign_up_text, class: 'label-bold'
= f.text_area :after_sign_up_text, class: 'form-control', rows: 4
.form-text.text-muted Markdown enabled
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
app/views/admin/application_settings/_snowplow.html.haml
View file @ 9bc18e56
......@@ -26,4 +26,4 @@
= f.label :snowplow_cookie_domain, _('Cookie domain'), class: 'label-light'
= f.text_field :snowplow_cookie_domain, class: 'form-control'
= f.submit _('Save changes'), class: 'btn btn-success'
= f.submit _('Save changes'), class: 'gl-button btn btn-success'
app/views/admin/application_settings/_sourcegraph.html.haml
View file @ 9bc18e56
......@@ -35,4 +35,4 @@
= f.text_field :sourcegraph_url, class: 'form-control', 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: 'btn btn-success'
= f.submit s_('SourcegraphAdmin|Save changes'), class: 'gl-button btn btn-success'
app/views/admin/application_settings/_spam.html.haml
View file @ 9bc18e56
......@@ -71,4 +71,4 @@
= 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.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
app/views/admin/application_settings/_terminal.html.haml
View file @ 9bc18e56
......@@ -8,4 +8,4 @@
.form-text.text-muted
Maximum time for web terminal websocket connection (in seconds).
0 for unlimited.
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
app/views/admin/application_settings/_terms.html.haml
View file @ 9bc18e56
......@@ -15,4 +15,4 @@
= f.text_area :terms, class: 'form-control', rows: 8
.form-text.text-muted
= _("Markdown enabled")
= f.submit _("Save changes"), class: "btn btn-success"
= f.submit _("Save changes"), class: "gl-button btn btn-success"
app/views/admin/application_settings/_third_party_offers.html.haml
View file @ 9bc18e56
......@@ -17,4 +17,4 @@
= f.check_box :hide_third_party_offers, class: 'form-check-input'
= f.label :hide_third_party_offers, _('Do not display offers from third parties within GitLab'), class: 'form-check-label'
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
app/views/admin/application_settings/_usage.html.haml
View file @ 9bc18e56
......@@ -37,4 +37,4 @@
- deactivating_usage_ping_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: deactivating_usage_ping_path }
= s_('For more information, see the documentation on %{deactivating_usage_ping_link_start}deactivating the usage ping%{deactivating_usage_ping_link_end}.').html_safe % { deactivating_usage_ping_link_start: deactivating_usage_ping_link_start, deactivating_usage_ping_link_end: '</a>'.html_safe }
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
app/views/admin/application_settings/_visibility_and_access.html.haml
View file @ 9bc18e56
......@@ -66,4 +66,4 @@
.form-group
= f.label field_name, "#{type.upcase} SSH keys", class: 'label-bold'
= f.select field_name, key_restriction_options_for_select(type), {}, class: 'form-control'
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
app/views/admin/application_settings/general.html.haml
View file @ 9bc18e56
......@@ -101,7 +101,7 @@
= s_('IDE|Live Preview')
%span.form-text.text-muted
= s_('IDE|Allow live previews of JavaScript projects in the Web IDE using CodeSandbox Live Preview.')
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
- if Feature.enabled?(:maintenance_mode)
%section.settings.no-animate#js-maintenance-mode-toggle{ class: ('expanded' if expanded_by_default?) }
......
ee/app/views/admin/application_settings/_custom_templates_form.html.haml
View file @ 9bc18e56
......@@ -16,4 +16,4 @@
.form-group
= groups_select_tag('application_setting[custom_project_templates_group_id]', selected: @application_setting.custom_project_templates_group_id, class: 'input-clamp allowClear qa-custom-project-template-select', multiple: false)
= f.submit _('Save changes'), class: "btn btn-success qa-save-changes-button"
= f.submit _('Save changes'), class: "gl-button btn btn-success qa-save-changes-button"
ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
View file @ 9bc18e56
......@@ -102,7 +102,7 @@
.sub-section
%h4= _('Elasticsearch zero-downtime reindexing')
= link_to _('Trigger cluster reindexing'), admin_elasticsearch_trigger_reindexing_path, class: 'btn btn-primary', data: { confirm: _('Are you sure you want to reindex?') }, method: :post, disabled: @elasticsearch_reindexing_task&.in_progress?
= link_to _('Trigger cluster reindexing'), admin_elasticsearch_trigger_reindexing_path, class: 'gl-button btn btn-primary', data: { confirm: _('Are you sure you want to reindex?') }, method: :post, disabled: @elasticsearch_reindexing_task&.in_progress?
.form-text.text-muted
= _('This feature should be used with an index that was created after 13.0')
- Elastic::ReindexingTask.old_indices_scheduled_for_deletion.each do |task|
......@@ -174,4 +174,4 @@
.form-text.text-muted
= _('AWS Secret Access Key. Only required if not using role instance credentials')
= f.submit _('Save changes'), class: "btn btn-success", data: { qa_selector: 'submit_button' }
= f.submit _('Save changes'), class: "gl-button btn btn-success", data: { qa_selector: 'submit_button' }
ee/app/views/admin/application_settings/_network_incident_management.html.haml
View file @ 9bc18e56
......@@ -16,4 +16,4 @@
= 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.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
ee/app/views/admin/application_settings/_pseudonymizer.html.haml
View file @ 9bc18e56
......@@ -15,4 +15,4 @@
- else
= pseudonymizer_disabled_description_text
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
ee/app/views/admin/application_settings/_required_instance_ci_setting.html.haml
View file @ 9bc18e56
......@@ -22,4 +22,4 @@
= dropdown_tag(s_('AdminSettings|No required pipeline'), options: { toggle_class: 'js-ci-template-dropdown dropdown-select', title: s_('AdminSettings|Select a template'), filter: true, placeholder: _("Filter"), data: { data: gitlab_ci_ymls(nil) } } )
= f.text_field :required_instance_ci_template, value: @application_setting.required_instance_ci_template, id: 'required_instance_ci_template_name', class: 'hidden'
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
ee/app/views/admin/application_settings/_seat_link_form.html.haml
View file @ 9bc18e56
......@@ -28,4 +28,4 @@
- link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: link_path }
= s_('For more information, see the documentation on %{link_start}disabling Seat Link%{link_end}.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
ee/app/views/admin/application_settings/_slack.html.haml
View file @ 9bc18e56
......@@ -31,4 +31,4 @@
= f.label :slack_app_verification_token, 'Verification token', class: 'label-bold'
= f.text_field :slack_app_verification_token, class: 'form-control'
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "gl-button btn btn-success"
ee/app/views/admin/application_settings/_templates.html.haml
View file @ 9bc18e56
......@@ -19,4 +19,4 @@
= link_to 'template repository', help_page_path("user/admin_area/settings/instance_template_repository")
= project_select_tag('application_setting[file_template_project_id]', class: 'project-item-select hidden-filter-value', toggle_class: 'js-project-search js-project-filter js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-project js-filter-submit',
placeholder: _('Search projects'), idAttribute: 'id', data: { order_by: 'last_activity_at', idattribute: 'id', all_projects: 'true', simple_filter: true, allow_clear: true }, value: @application_setting.file_template_project_id)
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "gl-button btn btn-success"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7