Skip to content

G
gitlab-ce
Commit db704770 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray
Browse files
Options

Replace label-light with label-bold. Because it's bold, not light

parent ee7069e5
Hide whitespace changes
Inline Side-by-side
Showing with 254 additions and 254 deletions
app/assets/javascripts/boards/components/board_new_issue.vue
View file @ db704770
...@@ -105,7 +105,7 @@ export default { ...@@ -105,7 +105,7 @@ export default {
</div> </div>
<label <label
:for="list.id + '-title'" :for="list.id + '-title'"
class="label-light" class="label-bold"
> >
Title Title
</label> </label>
......
app/assets/javascripts/boards/components/project_select.vue
View file @ db704770
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
<template> <template>
<div> <div>
<label class="label-light prepend-top-10"> <label class="label-bold prepend-top-10">
Project Project
</label> </label>
<div <div
......
app/assets/javascripts/ide/components/new_dropdown/modal.vue
View file @ db704770
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
<div <div
class="form-group row" class="form-group row"
> >
<label class="label-light col-form-label col-sm-3"> <label class="label-bold col-form-label col-sm-3">
{{ __('Name') }} {{ __('Name') }}
</label> </label>
<div class="col-sm-9"> <div class="col-sm-9">
......
app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
View file @ db704770
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
:name="inputNameAttribute" :name="inputNameAttribute"
:value="cronInterval" :value="cronInterval"
:checked="isEditable" :checked="isEditable"
class="label-light" class="label-bold"
type="radio" type="radio"
@click="toggleCustomInput(true)" @click="toggleCustomInput(true)"
/> />
...@@ -93,13 +93,13 @@ ...@@ -93,13 +93,13 @@
v-model="cronInterval" v-model="cronInterval"
:name="inputNameAttribute" :name="inputNameAttribute"
:value="cronIntervalPresets.everyDay" :value="cronIntervalPresets.everyDay"
class="label-light" class="label-bold"
type="radio" type="radio"
@click="toggleCustomInput(false)" @click="toggleCustomInput(false)"
/> />
<label <label
class="label-light" class="label-bold"
for="every-day" for="every-day"
> >
{{ __('Every day (at 4:00am)') }} {{ __('Every day (at 4:00am)') }}
...@@ -112,13 +112,13 @@ ...@@ -112,13 +112,13 @@
v-model="cronInterval" v-model="cronInterval"
:name="inputNameAttribute" :name="inputNameAttribute"
:value="cronIntervalPresets.everyWeek" :value="cronIntervalPresets.everyWeek"
class="label-light" class="label-bold"
type="radio" type="radio"
@click="toggleCustomInput(false)" @click="toggleCustomInput(false)"
/> />
<label <label
class="label-light" class="label-bold"
for="every-week" for="every-week"
> >
{{ __('Every week (Sundays at 4:00am)') }} {{ __('Every week (Sundays at 4:00am)') }}
...@@ -131,13 +131,13 @@ ...@@ -131,13 +131,13 @@
v-model="cronInterval" v-model="cronInterval"
:name="inputNameAttribute" :name="inputNameAttribute"
:value="cronIntervalPresets.everyMonth" :value="cronIntervalPresets.everyMonth"
class="label-light" class="label-bold"
type="radio" type="radio"
@click="toggleCustomInput(false)" @click="toggleCustomInput(false)"
/> />
<label <label
class="label-light" class="label-bold"
for="every-month" for="every-month"
> >
{{ __('Every month (on the 1st at 4:00am)') }} {{ __('Every month (on the 1st at 4:00am)') }}
......
app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue
View file @ db704770
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<div class="project-feature-row"> <div class="project-feature-row">
<label <label
v-if="label" v-if="label"
class="label-light" class="label-bold"
> >
{{ label }} {{ label }}
<a <a
......
app/assets/stylesheets/framework/forms.scss
View file @ db704770
...@@ -31,7 +31,7 @@ label { ...@@ -31,7 +31,7 @@ label {
margin: 0; margin: 0;
} }
&.label-light { &.label-bold {
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
} }
} }
......
app/views/admin/application_settings/_abuse.html.haml
View file @ db704770
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%fieldset %fieldset
.form-group .form-group
= f.label :admin_notification_email, 'Abuse reports notification email', class: 'label-light' = f.label :admin_notification_email, 'Abuse reports notification email', class: 'label-bold'
= f.text_field :admin_notification_email, class: 'form-control' = f.text_field :admin_notification_email, class: 'form-control'
.form-text.text-muted .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. Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area.
......
app/views/admin/application_settings/_account_and_limit.html.haml
View file @ db704770
...@@ -8,26 +8,26 @@ ...@@ -8,26 +8,26 @@
= f.label :gravatar_enabled, class: 'form-check-label' do = f.label :gravatar_enabled, class: 'form-check-label' do
Gravatar enabled Gravatar enabled
.form-group .form-group
= f.label :default_projects_limit, class: 'label-light' = f.label :default_projects_limit, class: 'label-bold'
= f.number_field :default_projects_limit, class: 'form-control' = f.number_field :default_projects_limit, class: 'form-control'
.form-group .form-group
= f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'label-light' = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'label-bold'
= f.number_field :max_attachment_size, class: 'form-control' = f.number_field :max_attachment_size, class: 'form-control'
= render 'repository_size_limit_setting', form: f = render 'repository_size_limit_setting', form: f
.form-group .form-group
= f.label :session_expire_delay, 'Session duration (minutes)', class: 'label-light' = f.label :session_expire_delay, 'Session duration (minutes)', class: 'label-bold'
= f.number_field :session_expire_delay, class: 'form-control' = f.number_field :session_expire_delay, class: 'form-control'
%span.form-text.text-muted#session_expire_delay_help_block GitLab restart is required to apply changes %span.form-text.text-muted#session_expire_delay_help_block GitLab restart is required to apply changes
.form-group .form-group
= f.label :user_oauth_applications, 'User OAuth applications', class: 'label-light' = f.label :user_oauth_applications, 'User OAuth applications', class: 'label-bold'
.form-check .form-check
= f.check_box :user_oauth_applications, class: 'form-check-input' = f.check_box :user_oauth_applications, class: 'form-check-input'
= f.label :user_oauth_applications, class: 'form-check-label' do = f.label :user_oauth_applications, class: 'form-check-label' do
Allow users to register any application to use GitLab as an OAuth provider Allow users to register any application to use GitLab as an OAuth provider
.form-group .form-group
= f.label :user_default_external, 'New users set to external', class: 'label-light' = f.label :user_default_external, 'New users set to external', class: 'label-bold'
.form-check .form-check
= f.check_box :user_default_external, class: 'form-check-input' = f.check_box :user_default_external, class: 'form-check-input'
= f.label :user_default_external, class: 'form-check-label' do = f.label :user_default_external, class: 'form-check-label' do
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
- if ::Gitlab.dev_env_or_com? - if ::Gitlab.dev_env_or_com?
.form-group .form-group
= f.label :check_namespace_plan, 'Check feature availability on namespace plan', class: 'label-light' = f.label :check_namespace_plan, 'Check feature availability on namespace plan', class: 'label-bold'
.form-check .form-check
= f.check_box :check_namespace_plan, class: 'form-check-input' = f.check_box :check_namespace_plan, class: 'form-check-input'
= f.label :check_namespace_plan, class: 'form-check-label' do = f.label :check_namespace_plan, class: 'form-check-label' do
......
app/views/admin/application_settings/_background_jobs.html.haml
View file @ db704770
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
.form-text.text-muted .form-text.text-muted
Limit the amount of resources slow running jobs are assigned. Limit the amount of resources slow running jobs are assigned.
.form-group .form-group
= f.label :sidekiq_throttling_queues, 'Sidekiq queues to throttle', class: 'label-light' = f.label :sidekiq_throttling_queues, 'Sidekiq queues to throttle', class: 'label-bold'
= f.select :sidekiq_throttling_queues, sidekiq_queue_options_for_select, { include_hidden: false }, multiple: true, class: 'select2 select-wide', data: { field: 'sidekiq_throttling_queues' } = f.select :sidekiq_throttling_queues, sidekiq_queue_options_for_select, { include_hidden: false }, multiple: true, class: 'select2 select-wide', data: { field: 'sidekiq_throttling_queues' }
.form-text.text-muted .form-text.text-muted
Choose which queues you wish to throttle. Choose which queues you wish to throttle.
.form-group .form-group
= f.label :sidekiq_throttling_factor, 'Throttling Factor', class: 'label-light' = f.label :sidekiq_throttling_factor, 'Throttling Factor', class: 'label-bold'
= f.number_field :sidekiq_throttling_factor, class: 'form-control', min: '0.01', max: '0.99', step: '0.01' = f.number_field :sidekiq_throttling_factor, class: 'form-control', min: '0.01', max: '0.99', step: '0.01'
.form-text.text-muted .form-text.text-muted
The factor by which the queues should be throttled. A value between 0.0 and 1.0, exclusive. The factor by which the queues should be throttled. A value between 0.0 and 1.0, exclusive.
......
app/views/admin/application_settings/_ci_cd.html.haml
View file @ db704770
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
It will automatically build, test, and deploy applications based on a predefined CI/CD configuration It will automatically build, test, and deploy applications based on a predefined CI/CD configuration
= link_to icon('question-circle'), help_page_path('topics/autodevops/index.md') = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md')
.form-group .form-group
= f.label :auto_devops_domain, class: 'label-light' = f.label :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', placeholder: 'domain.com'
.form-text.text-muted .form-text.text-muted
= s_("AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages.") = s_("AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages.")
...@@ -24,17 +24,17 @@ ...@@ -24,17 +24,17 @@
= render 'shared_runners_minutes_setting', form: f = render 'shared_runners_minutes_setting', form: f
.form-group .form-group
= f.label :shared_runners_text, class: 'label-light' = 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', rows: 4
.form-text.text-muted Markdown enabled .form-text.text-muted Markdown enabled
.form-group .form-group
= f.label :max_artifacts_size, 'Maximum artifacts size (MB)', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Set the maximum file size for each job's artifacts Set the maximum file size for each job's artifacts
= link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'maximum-artifacts-size') = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'maximum-artifacts-size')
.form-group .form-group
= f.label :default_artifacts_expire_in, 'Default artifacts expiration', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Set the default expiration time for each job's artifacts. Set the default expiration time for each job's artifacts.
......
app/views/admin/application_settings/_email.html.haml
View file @ db704770
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
-# EE-specific start -# EE-specific start
- if License.feature_available?(:email_additional_text) - if License.feature_available?(:email_additional_text)
.form-group .form-group
= f.label :email_additional_text, _('Additional text'), class: 'label-light' = f.label :email_additional_text, _('Additional text'), class: 'label-bold'
= f.text_area :email_additional_text, class: 'form-control', maxlength: Gitlab::CurrentSettings.email_additional_text_character_limit, rows: 4 = f.text_area :email_additional_text, class: 'form-control', maxlength: Gitlab::CurrentSettings.email_additional_text_character_limit, rows: 4
.form-text.text-muted .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) } = _('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) }
......
app/views/admin/application_settings/_gitaly.html.haml
View file @ db704770
...@@ -3,20 +3,20 @@ ...@@ -3,20 +3,20 @@
%fieldset %fieldset
.form-group .form-group
= f.label :gitaly_timeout_default, 'Default Timeout Period', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Timeout for Gitaly calls from the GitLab application (in seconds). This timeout is not enforced Timeout for Gitaly calls from the GitLab application (in seconds). This timeout is not enforced
for git fetch/push operations or Sidekiq jobs. for git fetch/push operations or Sidekiq jobs.
.form-group .form-group
= f.label :gitaly_timeout_fast, 'Fast Timeout Period', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Fast operation timeout (in seconds). Some Gitaly operations are expected to be fast. 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' 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. can help maintain the stability of the GitLab instance.
.form-group .form-group
= f.label :gitaly_timeout_medium, 'Medium Timeout Period', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Medium operation timeout (in seconds). This should be a value between the Fast and the Default timeout. Medium operation timeout (in seconds). This should be a value between the Fast and the Default timeout.
......
app/views/admin/application_settings/_help_page.html.haml
View file @ db704770
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
%fieldset %fieldset
.form-group .form-group
= f.label :help_text, class: 'label-light' = f.label :help_text, class: 'label-bold'
= f.text_area :help_text, class: 'form-control', rows: 4 = f.text_area :help_text, class: 'form-control', rows: 4
.form-text.text-muted Markdown enabled .form-text.text-muted Markdown enabled
.form-group .form-group
= f.label :help_page_text, class: 'label-light' = 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', rows: 4
.form-text.text-muted Markdown enabled .form-text.text-muted Markdown enabled
.form-group .form-group
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
= f.label :help_page_hide_commercial_content, class: 'form-check-label' do = f.label :help_page_hide_commercial_content, class: 'form-check-label' do
Hide marketing-related entries from help Hide marketing-related entries from help
.form-group .form-group
= f.label :help_page_support_url, 'Support page URL', class: 'label-light' = 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', 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 %span.form-text.text-muted#support_help_block Alternate support URL for help page
......
app/views/admin/application_settings/_influx.html.haml
View file @ db704770
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
= f.label :metrics_enabled, class: 'form-check-label' do = f.label :metrics_enabled, class: 'form-check-label' do
Enable InfluxDB Metrics Enable InfluxDB Metrics
.form-group .form-group
= f.label :metrics_host, 'InfluxDB host', class: 'label-light' = f.label :metrics_host, 'InfluxDB host', class: 'label-bold'
= f.text_field :metrics_host, class: 'form-control', placeholder: 'influxdb.example.com' = f.text_field :metrics_host, class: 'form-control', placeholder: 'influxdb.example.com'
.form-group .form-group
= f.label :metrics_port, 'InfluxDB port', class: 'label-light' = f.label :metrics_port, 'InfluxDB port', class: 'label-bold'
= f.text_field :metrics_port, class: 'form-control', placeholder: '8089' = f.text_field :metrics_port, class: 'form-control', placeholder: '8089'
.form-text.text-muted .form-text.text-muted
The UDP port to use for connecting to InfluxDB. InfluxDB requires that The UDP port to use for connecting to InfluxDB. InfluxDB requires that
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
sending messages to this port, without it metrics data will not be sending messages to this port, without it metrics data will not be
saved. saved.
.form-group .form-group
= f.label :metrics_pool_size, 'Connection pool size', class: 'label-light' = f.label :metrics_pool_size, 'Connection pool size', class: 'label-bold'
= f.number_field :metrics_pool_size, class: 'form-control' = f.number_field :metrics_pool_size, class: 'form-control'
.form-text.text-muted .form-text.text-muted
The amount of InfluxDB connections to open. Connections are opened The amount of InfluxDB connections to open. Connections are opened
...@@ -33,25 +33,25 @@ ...@@ -33,25 +33,25 @@
enough connections are available (at minimum the amount of application enough connections are available (at minimum the amount of application
server threads). server threads).
.form-group .form-group
= f.label :metrics_timeout, 'Connection timeout', class: 'label-light' = f.label :metrics_timeout, 'Connection timeout', class: 'label-bold'
= f.number_field :metrics_timeout, class: 'form-control' = f.number_field :metrics_timeout, class: 'form-control'
.form-text.text-muted .form-text.text-muted
The amount of seconds after which an InfluxDB connection will time The amount of seconds after which an InfluxDB connection will time
out. out.
.form-group .form-group
= f.label :metrics_method_call_threshold, 'Method Call Threshold (ms)', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
A method call is only tracked when it takes longer to complete than A method call is only tracked when it takes longer to complete than
the given amount of milliseconds. the given amount of milliseconds.
.form-group .form-group
= f.label :metrics_sample_interval, 'Sampler Interval (sec)', class: 'label-light' = f.label :metrics_sample_interval, 'Sampler Interval (sec)', class: 'label-bold'
= f.number_field :metrics_sample_interval, class: 'form-control' = f.number_field :metrics_sample_interval, class: 'form-control'
.form-text.text-muted .form-text.text-muted
The sampling interval in seconds. Sampled data includes memory usage, The sampling interval in seconds. Sampled data includes memory usage,
retained Ruby objects, file descriptors and so on. retained Ruby objects, file descriptors and so on.
.form-group .form-group
= f.label :metrics_packet_size, 'Metrics per packet', class: 'label-light' = f.label :metrics_packet_size, 'Metrics per packet', class: 'label-bold'
= f.number_field :metrics_packet_size, class: 'form-control' = f.number_field :metrics_packet_size, class: 'form-control'
.form-text.text-muted .form-text.text-muted
The amount of points to store in a single UDP packet. More points The amount of points to store in a single UDP packet. More points
......
app/views/admin/application_settings/_ip_limits.html.haml
View file @ db704770
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
%span.form-text.text-muted %span.form-text.text-muted
Helps reduce request volume (e.g. from crawlers or abusive bots) Helps reduce request volume (e.g. from crawlers or abusive bots)
.form-group .form-group
= f.label :throttle_unauthenticated_requests_per_period, 'Max requests per period per IP', class: 'label-light' = f.label :throttle_unauthenticated_requests_per_period, 'Max 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'
.form-group .form-group
= f.label :throttle_unauthenticated_period_in_seconds, 'Rate limit period in seconds', class: 'label-light' = f.label :throttle_unauthenticated_period_in_seconds, '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'
.form-group .form-group
.form-check .form-check
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
%span.form-text.text-muted %span.form-text.text-muted
Helps reduce request volume (e.g. from crawlers or abusive bots) Helps reduce request volume (e.g. from crawlers or abusive bots)
.form-group .form-group
= f.label :throttle_authenticated_api_requests_per_period, 'Max requests per period per user', class: 'label-light' = f.label :throttle_authenticated_api_requests_per_period, 'Max 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'
.form-group .form-group
= f.label :throttle_authenticated_api_period_in_seconds, 'Rate limit period in seconds', class: 'label-light' = f.label :throttle_authenticated_api_period_in_seconds, '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'
.form-group .form-group
.form-check .form-check
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
%span.form-text.text-muted %span.form-text.text-muted
Helps reduce request volume (e.g. from crawlers or abusive bots) Helps reduce request volume (e.g. from crawlers or abusive bots)
.form-group .form-group
= f.label :throttle_authenticated_web_requests_per_period, 'Max requests per period per user', class: 'label-light' = f.label :throttle_authenticated_web_requests_per_period, 'Max 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'
.form-group .form-group
= f.label :throttle_authenticated_web_period_in_seconds, 'Rate limit period in seconds', class: 'label-light' = 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.number_field :throttle_authenticated_web_period_in_seconds, class: 'form-control'
= f.submit 'Save changes', class: "btn btn-success" = f.submit 'Save changes', class: "btn btn-success"
app/views/admin/application_settings/_koding.html.haml
View file @ db704770
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
.form-text.text-muted .form-text.text-muted
Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again. Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again.
.form-group .form-group
= f.label :koding_url, 'Koding URL', class: 'label-light' = f.label :koding_url, 'Koding URL', class: 'label-bold'
= f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090' = f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090'
.form-text.text-muted .form-text.text-muted
Koding has integration enabled out of the box for the Koding has integration enabled out of the box for the
......
app/views/admin/application_settings/_logging.html.haml
View file @ db704770
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
%a{ href: 'https://getsentry.com', target: '_blank', rel: 'noopener noreferrer' } https://getsentry.com %a{ href: 'https://getsentry.com', target: '_blank', rel: 'noopener noreferrer' } https://getsentry.com
.form-group .form-group
= f.label :sentry_dsn, 'Sentry DSN', class: 'label-light' = f.label :sentry_dsn, 'Sentry DSN', class: 'label-bold'
= f.text_field :sentry_dsn, class: 'form-control' = f.text_field :sentry_dsn, class: 'form-control'
.form-group .form-group
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
%a{ href: 'https://sentry.io/for/javascript/', target: '_blank', rel: 'noopener noreferrer' } https://sentry.io/for/javascript/ %a{ href: 'https://sentry.io/for/javascript/', target: '_blank', rel: 'noopener noreferrer' } https://sentry.io/for/javascript/
.form-group .form-group
= f.label :clientside_sentry_dsn, 'Clientside Sentry DSN', class: 'label-light' = f.label :clientside_sentry_dsn, 'Clientside Sentry DSN', class: 'label-bold'
= f.text_field :clientside_sentry_dsn, class: 'form-control' = f.text_field :clientside_sentry_dsn, class: 'form-control'
= f.submit 'Save changes', class: "btn btn-success" = f.submit 'Save changes', class: "btn btn-success"
app/views/admin/application_settings/_pages.html.haml
View file @ db704770
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%fieldset %fieldset
.form-group .form-group
= f.label :max_pages_size, 'Maximum size of pages (MB)', class: 'label-light' = 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'
.form-text.text-muted 0 for unlimited .form-text.text-muted 0 for unlimited
.form-group .form-group
......
app/views/admin/application_settings/_performance_bar.html.haml
View file @ db704770
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= f.label :performance_bar_enabled, class: 'form-check-label' do = f.label :performance_bar_enabled, class: 'form-check-label' do
Enable the Performance Bar Enable the Performance Bar
.form-group .form-group
= f.label :performance_bar_allowed_group_path, 'Allowed group', class: 'label-light' = 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', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path
= f.submit 'Save changes', class: "btn btn-success" = f.submit 'Save changes', class: "btn btn-success"
app/views/admin/application_settings/_plantuml.html.haml
View file @ db704770
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= f.label :plantuml_enabled, class: 'form-check-label' do = f.label :plantuml_enabled, class: 'form-check-label' do
Enable PlantUML Enable PlantUML
.form-group .form-group
= f.label :plantuml_url, 'PlantUML URL', class: 'label-light' = f.label :plantuml_url, 'PlantUML URL', class: 'label-bold'
= f.text_field :plantuml_url, class: 'form-control', placeholder: 'http://gitlab.your-plantuml-instance.com:8080' = f.text_field :plantuml_url, class: 'form-control', placeholder: 'http://gitlab.your-plantuml-instance.com:8080'
.form-text.text-muted .form-text.text-muted
Allow rendering of Allow rendering of
......
app/views/admin/application_settings/_realtime.html.haml
View file @ db704770
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%fieldset %fieldset
.form-group .form-group
= f.label :polling_interval_multiplier, 'Polling interval multiplier', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Change this value to influence how frequently the GitLab UI polls for updates. Change this value to influence how frequently the GitLab UI polls for updates.
......
app/views/admin/application_settings/_registry.html.haml
View file @ db704770
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%fieldset %fieldset
.form-group .form-group
= f.label :container_registry_token_expire_delay, 'Authorization token duration (minutes)', class: 'label-light' = 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'
= f.submit 'Save changes', class: "btn btn-success" = f.submit 'Save changes', class: "btn btn-success"
app/views/admin/application_settings/_repository_check.html.haml
View file @ db704770
...@@ -38,17 +38,17 @@ ...@@ -38,17 +38,17 @@
Creating pack file bitmaps makes housekeeping take a little longer but Creating pack file bitmaps makes housekeeping take a little longer but
bitmaps should accelerate 'git clone' performance. bitmaps should accelerate 'git clone' performance.
.form-group .form-group
= f.label :housekeeping_incremental_repack_period, 'Incremental repack period', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Number of Git pushes after which an incremental 'git repack' is run. Number of Git pushes after which an incremental 'git repack' is run.
.form-group .form-group
= f.label :housekeeping_full_repack_period, 'Full repack period', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Number of Git pushes after which a full 'git repack' is run. Number of Git pushes after which a full 'git repack' is run.
.form-group .form-group
= f.label :housekeeping_gc_period, 'Git GC period', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Number of Git pushes after which 'git gc' is run. Number of Git pushes after which 'git gc' is run.
......
app/views/admin/application_settings/_repository_mirrors_form.html.haml
View file @ db704770
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%fieldset %fieldset
.form-group .form-group
= f.label :mirror_available, 'Enable mirror configuration', class: 'label-light' = f.label :mirror_available, 'Enable mirror configuration', class: 'label-bold'
.form-check .form-check
= f.check_box :mirror_available, class: 'form-check-input' = f.check_box :mirror_available, class: 'form-check-input'
= f.label :mirror_available, class: 'form-check-label' do = f.label :mirror_available, class: 'form-check-label' do
......
app/views/admin/application_settings/_repository_storage.html.haml
View file @ db704770
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance. repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance.
%em (EXPERIMENTAL) %em (EXPERIMENTAL)
.form-group .form-group
= f.label :repository_storages, 'Storage paths for new projects', class: 'label-light' = f.label :repository_storages, 'Storage paths for new projects', class: 'label-bold'
= f.select :repository_storages, repository_storages_options_for_select(@application_setting.repository_storages), = f.select :repository_storages, repository_storages_options_for_select(@application_setting.repository_storages),
{include_hidden: false}, multiple: true, class: 'form-control' {include_hidden: false}, multiple: true, class: 'form-control'
.form-text.text-muted .form-text.text-muted
...@@ -23,27 +23,27 @@ ...@@ -23,27 +23,27 @@
.sub-section .sub-section
%h4 Circuit breaker %h4 Circuit breaker
.form-group .form-group
= f.label :circuitbreaker_check_interval, _('Check interval'), class: 'label-light' = f.label :circuitbreaker_check_interval, _('Check interval'), class: 'label-bold'
= f.number_field :circuitbreaker_check_interval, class: 'form-control' = f.number_field :circuitbreaker_check_interval, class: 'form-control'
.form-text.text-muted .form-text.text-muted
= circuitbreaker_check_interval_help_text = circuitbreaker_check_interval_help_text
.form-group .form-group
= f.label :circuitbreaker_access_retries, _('Number of access attempts'), class: 'label-light' = f.label :circuitbreaker_access_retries, _('Number of access attempts'), class: 'label-bold'
= f.number_field :circuitbreaker_access_retries, class: 'form-control' = f.number_field :circuitbreaker_access_retries, class: 'form-control'
.form-text.text-muted .form-text.text-muted
= circuitbreaker_access_retries_help_text = circuitbreaker_access_retries_help_text
.form-group .form-group
= f.label :circuitbreaker_storage_timeout, _('Seconds to wait for a storage access attempt'), class: 'label-light' = f.label :circuitbreaker_storage_timeout, _('Seconds to wait for a storage access attempt'), class: 'label-bold'
= f.number_field :circuitbreaker_storage_timeout, class: 'form-control' = f.number_field :circuitbreaker_storage_timeout, class: 'form-control'
.form-text.text-muted .form-text.text-muted
= circuitbreaker_storage_timeout_help_text = circuitbreaker_storage_timeout_help_text
.form-group .form-group
= f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'label-light' = f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'label-bold'
= f.number_field :circuitbreaker_failure_count_threshold, class: 'form-control' = f.number_field :circuitbreaker_failure_count_threshold, class: 'form-control'
.form-text.text-muted .form-text.text-muted
= circuitbreaker_failure_count_help_text = circuitbreaker_failure_count_help_text
.form-group .form-group
= f.label :circuitbreaker_failure_reset_time, _('Seconds before reseting failure information'), class: 'label-light' = f.label :circuitbreaker_failure_reset_time, _('Seconds before reseting failure information'), class: 'label-bold'
= f.number_field :circuitbreaker_failure_reset_time, class: 'form-control' = f.number_field :circuitbreaker_failure_reset_time, class: 'form-control'
.form-text.text-muted .form-text.text-muted
= circuitbreaker_failure_reset_time_help_text = circuitbreaker_failure_reset_time_help_text
......
app/views/admin/application_settings/_signin.html.haml
View file @ db704770
...@@ -21,31 +21,31 @@ ...@@ -21,31 +21,31 @@
must be used to authenticate. must be used to authenticate.
- if omniauth_enabled? && button_based_providers.any? - if omniauth_enabled? && button_based_providers.any?
.form-group .form-group
= f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'label-light' = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'label-bold'
= hidden_field_tag 'application_setting[enabled_oauth_sign_in_sources][]' = hidden_field_tag 'application_setting[enabled_oauth_sign_in_sources][]'
.btn-group{ data: { toggle: 'buttons' } } .btn-group{ data: { toggle: 'buttons' } }
- oauth_providers_checkboxes.each do |source| - oauth_providers_checkboxes.each do |source|
= source = source
.form-group .form-group
= f.label :two_factor_authentication, 'Two-factor authentication', class: 'label-light' = f.label :two_factor_authentication, 'Two-factor authentication', class: 'label-bold'
.form-check .form-check
= f.check_box :require_two_factor_authentication, class: 'form-check-input' = f.check_box :require_two_factor_authentication, class: 'form-check-input'
= f.label :require_two_factor_authentication, class: 'form-check-label' do = f.label :require_two_factor_authentication, class: 'form-check-label' do
Require all users to setup Two-factor authentication Require all users to setup Two-factor authentication
.form-group .form-group
= f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'label-light' = 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', placeholder: '0'
.form-text.text-muted Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication .form-text.text-muted Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication
.form-group .form-group
= f.label :home_page_url, 'Home page URL', class: 'label-light' = 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', 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 %span.form-text.text-muted#home_help_block We will redirect non-logged in users to this page
.form-group .form-group
= f.label :after_sign_out_path, class: 'label-light' = f.label :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', 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 %span.form-text.text-muted#after_sign_out_path_help_block We will redirect users to this page after they sign out
.form-group .form-group
= f.label :sign_in_text, class: 'label-light' = f.label :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', rows: 4
.form-text.text-muted Markdown enabled .form-text.text-muted Markdown enabled
......
app/views/admin/application_settings/_signup.html.haml
View file @ db704770
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
= f.label :send_user_confirmation_email, class: 'form-check-label' do = f.label :send_user_confirmation_email, class: 'form-check-label' do
Send confirmation email on sign-up Send confirmation email on sign-up
.form-group .form-group
= f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'label-light' = f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'label-bold'
= f.text_area :domain_whitelist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8 = f.text_area :domain_whitelist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8
.form-text.text-muted ONLY users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com .form-text.text-muted ONLY users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com
.form-group .form-group
= f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'label-light' = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'label-bold'
.form-check .form-check
= f.check_box :domain_blacklist_enabled, class: 'form-check-input' = f.check_box :domain_blacklist_enabled, class: 'form-check-input'
= f.label :domain_blacklist_enabled, class: 'form-check-label' do = f.label :domain_blacklist_enabled, class: 'form-check-label' do
...@@ -34,16 +34,16 @@ ...@@ -34,16 +34,16 @@
.option-title .option-title
Enter blacklist manually Enter blacklist manually
.form-group.blacklist-file .form-group.blacklist-file
= f.label :domain_blacklist_file, 'Blacklist file', class: 'label-light' = f.label :domain_blacklist_file, 'Blacklist file', class: 'label-bold'
= f.file_field :domain_blacklist_file, class: 'form-control', accept: '.txt,.conf' = f.file_field :domain_blacklist_file, class: 'form-control', accept: '.txt,.conf'
.form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines or commas for multiple entries. .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines or commas for multiple entries.
.form-group.blacklist-raw .form-group.blacklist-raw
= f.label :domain_blacklist, 'Blacklisted domains for sign-ups', class: 'label-light' = f.label :domain_blacklist, 'Blacklisted domains for sign-ups', class: 'label-bold'
= f.text_area :domain_blacklist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8 = f.text_area :domain_blacklist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8
.form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com
.form-group .form-group
= f.label :after_sign_up_text, class: 'label-light' = 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', rows: 4
.form-text.text-muted Markdown enabled .form-text.text-muted Markdown enabled
......
app/views/admin/application_settings/_spam.html.haml
View file @ db704770
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
%span.form-text.text-muted#recaptcha_help_block Helps prevent bots from creating accounts %span.form-text.text-muted#recaptcha_help_block Helps prevent bots from creating accounts
.form-group .form-group
= f.label :recaptcha_site_key, 'reCAPTCHA Site Key', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Generate site and private keys at Generate site and private keys at
%a{ href: 'http://www.google.com/recaptcha', target: 'blank' } http://www.google.com/recaptcha %a{ href: 'http://www.google.com/recaptcha', target: 'blank' } http://www.google.com/recaptcha
.form-group .form-group
= f.label :recaptcha_private_key, 'reCAPTCHA Private Key', class: 'label-light' = f.label :recaptcha_private_key, 'reCAPTCHA Private Key', class: 'label-bold'
= f.text_field :recaptcha_private_key, class: 'form-control' = f.text_field :recaptcha_private_key, class: 'form-control'
.form-group .form-group
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
%span.form-text.text-muted#akismet_help_block Helps prevent bots from creating issues %span.form-text.text-muted#akismet_help_block Helps prevent bots from creating issues
.form-group .form-group
= f.label :akismet_api_key, 'Akismet API Key', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Generate API key at Generate API key at
...@@ -43,13 +43,13 @@ ...@@ -43,13 +43,13 @@
Helps prevent malicious users hide their activity Helps prevent malicious users hide their activity
.form-group .form-group
= f.label :unique_ips_limit_per_user, 'IPs per user', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Maximum number of unique IPs per user Maximum number of unique IPs per user
.form-group .form-group
= f.label :unique_ips_limit_time_window, 'IP expiration time', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
How many seconds an IP will be counted towards the limit How many seconds an IP will be counted towards the limit
......
app/views/admin/application_settings/_terminal.html.haml
View file @ db704770
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%fieldset %fieldset
.form-group .form-group
= f.label :terminal_max_session_time, 'Max session time', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Maximum time for web terminal websocket connection (in seconds). Maximum time for web terminal websocket connection (in seconds).
......
app/views/admin/application_settings/_visibility_and_access.html.haml
View file @ db704770
...@@ -3,20 +3,20 @@ ...@@ -3,20 +3,20 @@
%fieldset %fieldset
.form-group .form-group
= f.label :default_branch_protection, class: 'label-light' = f.label :default_branch_protection, class: 'label-bold'
= f.select :default_branch_protection, options_for_select(Gitlab::Access.protection_options, @application_setting.default_branch_protection), {}, class: 'form-control' = f.select :default_branch_protection, options_for_select(Gitlab::Access.protection_options, @application_setting.default_branch_protection), {}, class: 'form-control'
= render partial: 'admin/application_settings/ee/project_creation_level', locals: { form: f, application_setting: @application_setting } = render partial: 'admin/application_settings/ee/project_creation_level', locals: { form: f, application_setting: @application_setting }
.form-group.visibility-level-setting .form-group.visibility-level-setting
= f.label :default_project_visibility, class: 'label-light' = f.label :default_project_visibility, class: 'label-bold'
= render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new) = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new)
.form-group.visibility-level-setting .form-group.visibility-level-setting
= f.label :default_snippet_visibility, class: 'label-light' = f.label :default_snippet_visibility, class: 'label-bold'
= render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: ProjectSnippet.new) = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: ProjectSnippet.new)
.form-group.visibility-level-setting .form-group.visibility-level-setting
= f.label :default_group_visibility, class: 'label-light' = f.label :default_group_visibility, class: 'label-bold'
= render('shared/visibility_radios', model_method: :default_group_visibility, form: f, selected_level: @application_setting.default_group_visibility, form_model: Group.new) = render('shared/visibility_radios', model_method: :default_group_visibility, form: f, selected_level: @application_setting.default_group_visibility, form_model: Group.new)
.form-group .form-group
= f.label :restricted_visibility_levels, class: 'label-light' = f.label :restricted_visibility_levels, class: 'label-bold'
- checkbox_name = 'application_setting[restricted_visibility_levels][]' - checkbox_name = 'application_setting[restricted_visibility_levels][]'
= hidden_field_tag(checkbox_name) = hidden_field_tag(checkbox_name)
- restricted_level_checkboxes('restricted-visibility-help', checkbox_name, class: 'form-check-input').each do |level| - restricted_level_checkboxes('restricted-visibility-help', checkbox_name, class: 'form-check-input').each do |level|
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
Selected levels cannot be used by non-admin users for groups, projects or snippets. Selected levels cannot be used by non-admin users for groups, projects or snippets.
If the public level is restricted, user profiles are only visible to logged in users. If the public level is restricted, user profiles are only visible to logged in users.
.form-group .form-group
= f.label :import_sources, class: 'label-light' = f.label :import_sources, class: 'label-bold'
= hidden_field_tag 'application_setting[import_sources][]' = hidden_field_tag 'application_setting[import_sources][]'
- import_sources_checkboxes('import-sources-help', class: 'form-check-input').each do |source| - import_sources_checkboxes('import-sources-help', class: 'form-check-input').each do |source|
.form-check= source .form-check= source
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
-# EE-only -# EE-only
- if ldap_enabled? - if ldap_enabled?
.form-group .form-group
= f.label :allow_group_owners_to_manage_ldap, 'LDAP settings', class: 'label-light' = f.label :allow_group_owners_to_manage_ldap, 'LDAP settings', class: 'label-bold'
.form-check .form-check
= f.check_box :allow_group_owners_to_manage_ldap, class: 'form-check-input' = f.check_box :allow_group_owners_to_manage_ldap, class: 'form-check-input'
= f.label :allow_group_owners_to_manage_ldap, class: 'form-check-label' do = f.label :allow_group_owners_to_manage_ldap, class: 'form-check-label' do
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
Project export enabled Project export enabled
.form-group .form-group
%label.label-light Enabled Git access protocols %label.label-bold Enabled Git access protocols
= select(:application_setting, :enabled_git_access_protocol, [['Both SSH and HTTP(S)', nil], ['Only SSH', 'ssh'], ['Only HTTP(S)', 'http']], {}, class: 'form-control') = select(:application_setting, :enabled_git_access_protocol, [['Both SSH and HTTP(S)', nil], ['Only SSH', 'ssh'], ['Only HTTP(S)', 'http']], {}, class: 'form-control')
%span.form-text.text-muted#clone-protocol-help %span.form-text.text-muted#clone-protocol-help
Allow only the selected protocols to be used for Git access. Allow only the selected protocols to be used for Git access.
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
- ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type| - ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type|
- field_name = :"#{type}_key_restriction" - field_name = :"#{type}_key_restriction"
.form-group .form-group
= f.label field_name, "#{type.upcase} SSH keys", class: 'label-light' = 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.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: "btn btn-success"
app/views/admin/hooks/_form.html.haml
View file @ db704770
= form_errors(hook) = form_errors(hook)
.form-group .form-group
= form.label :url, 'URL', class: 'label-light' = form.label :url, 'URL', class: 'label-bold'
= form.text_field :url, class: 'form-control' = form.text_field :url, class: 'form-control'
.form-group .form-group
= form.label :token, 'Secret Token', class: 'label-light' = form.label :token, 'Secret Token', class: 'label-bold'
= form.text_field :token, class: 'form-control' = form.text_field :token, class: 'form-control'
%p.form-text.text-muted %p.form-text.text-muted
Use this token to validate received payloads Use this token to validate received payloads
.form-group .form-group
= form.label :url, 'Trigger', class: 'label-light' = form.label :url, 'Trigger', class: 'label-bold'
%ul.list-unstyled %ul.list-unstyled
%li %li
.form-text.text-muted .form-text.text-muted
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
%p.light %p.light
This URL will be triggered when a merge request is created/updated/merged This URL will be triggered when a merge request is created/updated/merged
.form-group .form-group
= form.label :enable_ssl_verification, 'SSL verification', class: 'label-light checkbox' = form.label :enable_ssl_verification, 'SSL verification', class: 'label-bold checkbox'
.form-check .form-check
= form.check_box :enable_ssl_verification, class: 'form-check-input' = form.check_box :enable_ssl_verification, class: 'form-check-input'
= form.label :enable_ssl_verification, class: 'form-check-label' do = form.label :enable_ssl_verification, class: 'form-check-label' do
......
app/views/doorkeeper/applications/_form.html.haml
View file @ db704770
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
= form_errors(application) = form_errors(application)
.form-group .form-group
= f.label :name, class: 'label-light' = f.label :name, class: 'label-bold'
= f.text_field :name, class: 'form-control', required: true = f.text_field :name, class: 'form-control', required: true
.form-group .form-group
= f.label :redirect_uri, class: 'label-light' = f.label :redirect_uri, class: 'label-bold'
= f.text_area :redirect_uri, class: 'form-control', required: true = f.text_area :redirect_uri, class: 'form-control', required: true
%span.form-text.text-muted %span.form-text.text-muted
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
= _('Use <code>%{native_redirect_uri}</code> for local tests').html_safe % { native_redirect_uri: Doorkeeper.configuration.native_redirect_uri } = _('Use <code>%{native_redirect_uri}</code> for local tests').html_safe % { native_redirect_uri: Doorkeeper.configuration.native_redirect_uri }
.form-group .form-group
= f.label :scopes, class: 'label-light' = f.label :scopes, class: 'label-bold'
= render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes
.prepend-top-default .prepend-top-default
......
app/views/groups/settings/_general.html.haml
View file @ db704770
...@@ -4,17 +4,17 @@ ...@@ -4,17 +4,17 @@
%fieldset %fieldset
.row .row
.form-group.col-md-9 .form-group.col-md-9
= f.label :name, class: 'label-light' do = f.label :name, class: 'label-bold' do
Group name Group name
= f.text_field :name, class: 'form-control' = f.text_field :name, class: 'form-control'
.form-group.col-md-3 .form-group.col-md-3
= f.label :id, class: 'label-light' do = f.label :id, class: 'label-bold' do
Group ID Group ID
= f.text_field :id, class: 'form-control', readonly: true = f.text_field :id, class: 'form-control', readonly: true
.form-group .form-group
= f.label :description, class: 'label-light' do = f.label :description, class: 'label-bold' do
Group description Group description
%span.light (optional) %span.light (optional)
= f.text_area :description, class: 'form-control', rows: 3, maxlength: 250 = f.text_area :description, class: 'form-control', rows: 3, maxlength: 250
......
app/views/import/gitlab_projects/new.html.haml
View file @ db704770
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
= form_tag import_gitlab_project_path, class: 'new_project', multipart: true do = form_tag import_gitlab_project_path, class: 'new_project', multipart: true do
.row .row
.form-group.col-12.col-sm-6 .form-group.col-12.col-sm-6
= label_tag :namespace_id, 'Project path', class: 'label-light' = label_tag :namespace_id, 'Project path', class: 'label-bold'
.form-group .form-group
.input-group .input-group
- if current_user.can_select_namespace? - if current_user.can_select_namespace?
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#{user_url(current_user.username)}/ #{user_url(current_user.username)}/
= hidden_field_tag :namespace_id, value: current_user.namespace_id = hidden_field_tag :namespace_id, value: current_user.namespace_id
.form-group.col-12.col-sm-6.project-path .form-group.col-12.col-sm-6.project-path
= label_tag :path, _('Project name'), class: 'label-light' = label_tag :path, _('Project name'), class: 'label-bold'
= text_field_tag :path, @path, placeholder: "my-awesome-project", class: "js-path-name form-control", tabindex: 2, autofocus: true, required: true = text_field_tag :path, @path, placeholder: "my-awesome-project", class: "js-path-name form-control", tabindex: 2, autofocus: true, required: true
.row .row
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
.row .row
.form-group.col-sm-12 .form-group.col-sm-12
= hidden_field_tag :namespace_id, @namespace.id = hidden_field_tag :namespace_id, @namespace.id
= label_tag :file, _('GitLab project export'), class: 'label-light' = label_tag :file, _('GitLab project export'), class: 'label-bold'
.form-group .form-group
= file_field_tag :file, class: '' = file_field_tag :file, class: ''
.row .row
......
app/views/import/manifest/_form.html.haml
View file @ db704770
= form_tag upload_import_manifest_path, multipart: true do = form_tag upload_import_manifest_path, multipart: true do
.form-group .form-group
= label_tag :group_id, nil, class: 'label-light' do = label_tag :group_id, nil, class: 'label-bold' do
= _('Group') = _('Group')
.input-group .input-group
.input-group-prepend.has-tooltip{ title: root_url } .input-group-prepend.has-tooltip{ title: root_url }
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
= _('Choose the top-level group for your repository imports.') = _('Choose the top-level group for your repository imports.')
.form-group .form-group
= label_tag :manifest, class: 'label-light' do = label_tag :manifest, class: 'label-bold' do
= _('Manifest') = _('Manifest')
= file_field_tag :manifest, class: 'form-control-file', required: true = file_field_tag :manifest, class: 'form-control-file', required: true
.form-text.text-muted .form-text.text-muted
......
app/views/profiles/accounts/show.html.haml
View file @ db704770
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
%p %p
Activate signin with one of the following services Activate signin with one of the following services
.col-lg-8 .col-lg-8
%label.label-light %label.label-bold
Connected Accounts Connected Accounts
%p Click on icon to activate signin with one of the following services %p Click on icon to activate signin with one of the following services
- button_based_providers.each do |provider| - button_based_providers.each do |provider|
......
app/views/profiles/emails/index.html.haml
View file @ db704770
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
Add email address Add email address
= form_for 'email', url: profile_emails_path do |f| = form_for 'email', url: profile_emails_path do |f|
.form-group .form-group
= f.label :email, class: 'label-light' = f.label :email, class: 'label-bold'
= f.text_field :email, class: 'form-control' = f.text_field :email, class: 'form-control'
.prepend-top-default .prepend-top-default
= f.submit 'Add email address', class: 'btn btn-create' = f.submit 'Add email address', class: 'btn btn-create'
......
app/views/profiles/gpg_keys/_form.html.haml
View file @ db704770
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= form_errors(@gpg_key) = form_errors(@gpg_key)
.form-group .form-group
= f.label :key, class: 'label-light' = f.label :key, class: 'label-bold'
= f.text_area :key, class: "form-control", rows: 8, required: true, placeholder: "Don't paste the private part of the GPG key. Paste the public part which begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'." = f.text_area :key, class: "form-control", rows: 8, required: true, placeholder: "Don't paste the private part of the GPG key. Paste the public part which begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'."
.prepend-top-default .prepend-top-default
......
app/views/profiles/keys/_form.html.haml
View file @ db704770
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
= form_errors(@key) = form_errors(@key)
.form-group .form-group
= f.label :key, class: 'label-light' = f.label :key, class: 'label-bold'
%p= _("Paste your public SSH key, which is usually contained in the file '~/.ssh/id_rsa.pub' and begins with 'ssh-rsa'. Don't use your private SSH key.") %p= _("Paste your public SSH key, which is usually contained in the file '~/.ssh/id_rsa.pub' and begins with 'ssh-rsa'. Don't use your private SSH key.")
= f.text_area :key, class: "form-control js-add-ssh-key-validation-input", rows: 8, required: true, placeholder: s_('Profiles|Typically starts with "ssh-rsa …"') = f.text_area :key, class: "form-control js-add-ssh-key-validation-input", rows: 8, required: true, placeholder: s_('Profiles|Typically starts with "ssh-rsa …"')
.form-group .form-group
= f.label :title, class: 'label-light' = f.label :title, class: 'label-bold'
= f.text_field :title, class: "form-control input-lg", required: true, placeholder: s_('Profiles|e.g. My MacBook key') = f.text_field :title, class: "form-control input-lg", required: true, placeholder: s_('Profiles|e.g. My MacBook key')
%p.form-text.text-muted= _('Name your individual key via a title') %p.form-text.text-muted= _('Name your individual key via a title')
......
app/views/profiles/notifications/show.html.haml
View file @ db704770
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
= form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications prepend-top-default' } do |f| = form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications prepend-top-default' } do |f|
.form-group .form-group
= f.label :notification_email, class: "label-light" = f.label :notification_email, class: "label-bold"
= f.select :notification_email, @user.all_emails, { include_blank: false }, class: "select2" = f.select :notification_email, @user.all_emails, { include_blank: false }, class: "select2"
= label_tag :global_notification_level, "Global notification level", class: "label-light" = label_tag :global_notification_level, "Global notification level", class: "label-bold"
%br %br
.clearfix .clearfix
.form-group.float-left.global-notification-setting .form-group.float-left.global-notification-setting
......
app/views/profiles/passwords/edit.html.haml
View file @ db704770
...@@ -18,15 +18,15 @@ ...@@ -18,15 +18,15 @@
- unless @user.password_automatically_set? - unless @user.password_automatically_set?
.form-group .form-group
= f.label :current_password, class: 'label-light' = f.label :current_password, class: 'label-bold'
= f.password_field :current_password, required: true, class: 'form-control' = f.password_field :current_password, required: true, class: 'form-control'
%p.form-text.text-muted %p.form-text.text-muted
You must provide your current password in order to change it. You must provide your current password in order to change it.
.form-group .form-group
= f.label :password, 'New password', class: 'label-light' = f.label :password, 'New password', class: 'label-bold'
= f.password_field :password, required: true, class: 'form-control' = f.password_field :password, required: true, class: 'form-control'
.form-group .form-group
= f.label :password_confirmation, class: 'label-light' = f.label :password_confirmation, class: 'label-bold'
= f.password_field :password_confirmation, required: true, class: 'form-control' = f.password_field :password_confirmation, required: true, class: 'form-control'
.prepend-top-default.append-bottom-default .prepend-top-default.append-bottom-default
= f.submit 'Save password', class: "btn btn-create append-right-10" = f.submit 'Save password', class: "btn btn-create append-right-10"
......
app/views/profiles/personal_access_tokens/index.html.haml
View file @ db704770
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
%p %p
It cannot be used to access any other data. It cannot be used to access any other data.
.col-lg-8.feed-token-reset .col-lg-8.feed-token-reset
= label_tag :feed_token, 'Feed token', class: "label-light" = label_tag :feed_token, 'Feed token', class: "label-bold"
= text_field_tag :feed_token, current_user.feed_token, class: 'form-control', readonly: true, onclick: 'this.select()' = text_field_tag :feed_token, current_user.feed_token, class: 'form-control', readonly: true, onclick: 'this.select()'
%p.form-text.text-muted %p.form-text.text-muted
Keep this token secret. Anyone who gets ahold of it can read activity and issue RSS feeds or your calendar feed as if they were you. Keep this token secret. Anyone who gets ahold of it can read activity and issue RSS feeds or your calendar feed as if they were you.
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
%p %p
It cannot be used to access any other data. It cannot be used to access any other data.
.col-lg-8.incoming-email-token-reset .col-lg-8.incoming-email-token-reset
= label_tag :incoming_email_token, 'Incoming email token', class: "label-light" = label_tag :incoming_email_token, 'Incoming email token', class: "label-bold"
= text_field_tag :incoming_email_token, current_user.incoming_email_token, class: 'form-control', readonly: true, onclick: 'this.select()' = text_field_tag :incoming_email_token, current_user.incoming_email_token, class: 'form-control', readonly: true, onclick: 'this.select()'
%p.form-text.text-muted %p.form-text.text-muted
Keep this token secret. Anyone who gets ahold of it can create issues as if they were you. Keep this token secret. Anyone who gets ahold of it can create issues as if they were you.
......
app/views/profiles/preferences/show.html.haml
View file @ db704770
...@@ -42,17 +42,17 @@ ...@@ -42,17 +42,17 @@
= link_to 'Learn more', help_page_path('user/profile/preferences', anchor: 'behavior'), target: '_blank' = link_to 'Learn more', help_page_path('user/profile/preferences', anchor: 'behavior'), target: '_blank'
.col-lg-8 .col-lg-8
.form-group .form-group
= f.label :layout, class: 'label-light' do = f.label :layout, class: 'label-bold' do
Layout width Layout width
= f.select :layout, layout_choices, {}, class: 'form-control' = f.select :layout, layout_choices, {}, class: 'form-control'
.form-text.text-muted .form-text.text-muted
Choose between fixed (max. 1200px) and fluid (100%) application layout. Choose between fixed (max. 1200px) and fluid (100%) application layout.
.form-group .form-group
= f.label :dashboard, class: 'label-light' do = f.label :dashboard, class: 'label-bold' do
Default dashboard Default dashboard
= f.select :dashboard, dashboard_choices, {}, class: 'form-control' = f.select :dashboard, dashboard_choices, {}, class: 'form-control'
.form-group .form-group
= f.label :project_view, class: 'label-light' do = f.label :project_view, class: 'label-bold' do
Project overview content Project overview content
= f.select :project_view, project_view_choices, {}, class: 'form-control' = f.select :project_view, project_view_choices, {}, class: 'form-control'
.form-text.text-muted .form-text.text-muted
......
app/views/profiles/two_factor_auths/show.html.haml
View file @ db704770
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
.alert.alert-danger .alert.alert-danger
= @error = @error
.form-group .form-group
= label_tag :pin_code, nil, class: "label-light" = label_tag :pin_code, nil, class: "label-bold"
= text_field_tag :pin_code, nil, class: "form-control", required: true = text_field_tag :pin_code, nil, class: "form-control", required: true
.prepend-top-default .prepend-top-default
= submit_tag 'Register with two-factor app', class: 'btn btn-success' = submit_tag 'Register with two-factor app', class: 'btn btn-success'
......
app/views/projects/_merge_request_merge_method_settings.html.haml
View file @ db704770
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- project = local_assigns.fetch(:project) - project = local_assigns.fetch(:project)
.form-group .form-group
= label_tag :merge_method_merge, class: 'label-light' do = label_tag :merge_method_merge, class: 'label-bold' do
Merge method Merge method
.form-check .form-check
= form.radio_button :merge_method, :merge, class: "js-merge-method-radio form-check-input" = form.radio_button :merge_method, :merge, class: "js-merge-method-radio form-check-input"
......
app/views/projects/_new_project_fields.html.haml
View file @ db704770
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.row{ id: project_name_id } .row{ id: project_name_id }
= f.hidden_field :ci_cd_only, value: ci_cd_only = f.hidden_field :ci_cd_only, value: ci_cd_only
.form-group.project-path.col-sm-6 .form-group.project-path.col-sm-6
= f.label :namespace_id, class: 'label-light' do = f.label :namespace_id, class: 'label-bold' do
%span %span
Project path Project path
.input-group .input-group
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#{user_url(current_user.username)}/ #{user_url(current_user.username)}/
= f.hidden_field :namespace_id, value: current_user.namespace_id = f.hidden_field :namespace_id, value: current_user.namespace_id
.form-group.project-path.col-sm-6 .form-group.project-path.col-sm-6
= f.label :path, class: 'label-light' do = f.label :path, class: 'label-bold' do
%span %span
Project name Project name
= f.text_field :path, placeholder: "my-awesome-project", class: "form-control", tabindex: 2, autofocus: true, required: true = f.text_field :path, placeholder: "my-awesome-project", class: "form-control", tabindex: 2, autofocus: true, required: true
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
= link_to "Create a group", new_group_path = link_to "Create a group", new_group_path
.form-group .form-group
= f.label :description, class: 'label-light' do = f.label :description, class: 'label-bold' do
Project description Project description
%span (optional) %span (optional)
= f.text_area :description, placeholder: 'Description format', class: "form-control", rows: 3, maxlength: 250 = f.text_area :description, placeholder: 'Description format', class: "form-control", rows: 3, maxlength: 250
= f.label :visibility_level, class: 'label-light' do = f.label :visibility_level, class: 'label-bold' do
Visibility Level Visibility Level
= link_to icon('question-circle'), help_page_path("public_access/public_access"), aria: { label: 'Documentation for Visibility Level' }, target: '_blank', rel: 'noopener noreferrer' = link_to icon('question-circle'), help_page_path("public_access/public_access"), aria: { label: 'Documentation for Visibility Level' }, target: '_blank', rel: 'noopener noreferrer'
= render 'shared/visibility_level', f: f, visibility_level: visibility_level.to_i, can_change_visibility_level: true, form_model: @project, with_label: false = render 'shared/visibility_level', f: f, visibility_level: visibility_level.to_i, can_change_visibility_level: true, form_model: @project, with_label: false
......
app/views/projects/_project_templates.html.haml
View file @ db704770
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
.project-fields-form .project-fields-form
.row .row
.form-group.col-sm-12 .form-group.col-sm-12
%label.label-light %label.label-bold
Template Template
.input-group.template-input-group .input-group.template-input-group
.input-group-prepend .input-group-prepend
......
app/views/projects/clusters/gcp/_form.html.haml
View file @ db704770
...@@ -15,15 +15,15 @@ ...@@ -15,15 +15,15 @@
= form_for @gcp_cluster, html: { class: 'js-gke-cluster-creation prepend-top-20', data: { token: token_in_session } }, url: create_gcp_namespace_project_clusters_path(@project.namespace, @project), as: :cluster do |field| = form_for @gcp_cluster, html: { class: 'js-gke-cluster-creation prepend-top-20', data: { token: token_in_session } }, url: create_gcp_namespace_project_clusters_path(@project.namespace, @project), as: :cluster do |field|
= form_errors(@gcp_cluster) = form_errors(@gcp_cluster)
.form-group .form-group
= field.label :name, s_('ClusterIntegration|Kubernetes cluster name'), class: 'label-light' = field.label :name, s_('ClusterIntegration|Kubernetes cluster name'), class: 'label-bold'
= field.text_field :name, class: 'form-control', placeholder: s_('ClusterIntegration|Kubernetes cluster name') = field.text_field :name, class: 'form-control', placeholder: s_('ClusterIntegration|Kubernetes cluster name')
.form-group .form-group
= field.label :environment_scope, s_('ClusterIntegration|Environment scope'), class: 'label-light' = field.label :environment_scope, s_('ClusterIntegration|Environment scope'), class: 'label-bold'
= field.text_field :environment_scope, class: 'form-control', readonly: !has_multiple_clusters?(@project), placeholder: s_('ClusterIntegration|Environment scope') = field.text_field :environment_scope, class: 'form-control', readonly: !has_multiple_clusters?(@project), placeholder: s_('ClusterIntegration|Environment scope')
= field.fields_for :provider_gcp, @gcp_cluster.provider_gcp do |provider_gcp_field| = field.fields_for :provider_gcp, @gcp_cluster.provider_gcp do |provider_gcp_field|
.form-group .form-group
= provider_gcp_field.label :gcp_project_id, s_('ClusterIntegration|Google Cloud Platform project'), class: 'label-light' = provider_gcp_field.label :gcp_project_id, s_('ClusterIntegration|Google Cloud Platform project'), class: 'label-bold'
.js-gcp-project-id-dropdown-entry-point{ data: { docsUrl: 'https://console.cloud.google.com/home/dashboard' } } .js-gcp-project-id-dropdown-entry-point{ data: { docsUrl: 'https://console.cloud.google.com/home/dashboard' } }
= provider_gcp_field.hidden_field :gcp_project_id = provider_gcp_field.hidden_field :gcp_project_id
.dropdown .dropdown
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
%span.form-text.text-muted &nbsp; %span.form-text.text-muted &nbsp;
.form-group .form-group
= provider_gcp_field.label :zone, s_('ClusterIntegration|Zone'), class: 'label-light' = provider_gcp_field.label :zone, s_('ClusterIntegration|Zone'), class: 'label-bold'
.js-gcp-zone-dropdown-entry-point .js-gcp-zone-dropdown-entry-point
= provider_gcp_field.hidden_field :zone = provider_gcp_field.hidden_field :zone
.dropdown .dropdown
...@@ -46,11 +46,11 @@ ...@@ -46,11 +46,11 @@
= s_('ClusterIntegration|Learn more about %{help_link_start}zones%{help_link_end}.').html_safe % { help_link_start: help_link_start % { url: zones_link_url }, help_link_end: help_link_end } = s_('ClusterIntegration|Learn more about %{help_link_start}zones%{help_link_end}.').html_safe % { help_link_start: help_link_start % { url: zones_link_url }, help_link_end: help_link_end }
.form-group .form-group
= provider_gcp_field.label :num_nodes, s_('ClusterIntegration|Number of nodes'), class: 'label-light' = provider_gcp_field.label :num_nodes, s_('ClusterIntegration|Number of nodes'), class: 'label-bold'
= provider_gcp_field.text_field :num_nodes, class: 'form-control', placeholder: '3' = provider_gcp_field.text_field :num_nodes, class: 'form-control', placeholder: '3'
.form-group .form-group
= provider_gcp_field.label :machine_type, s_('ClusterIntegration|Machine type'), class: 'label-light' = provider_gcp_field.label :machine_type, s_('ClusterIntegration|Machine type'), class: 'label-bold'
.js-gcp-machine-type-dropdown-entry-point .js-gcp-machine-type-dropdown-entry-point
= provider_gcp_field.hidden_field :machine_type = provider_gcp_field.hidden_field :machine_type
.dropdown .dropdown
......
app/views/projects/clusters/user/_form.html.haml
View file @ db704770
= form_for @user_cluster, url: create_user_namespace_project_clusters_path(@project.namespace, @project), as: :cluster do |field| = form_for @user_cluster, url: create_user_namespace_project_clusters_path(@project.namespace, @project), as: :cluster do |field|
= form_errors(@user_cluster) = form_errors(@user_cluster)
.form-group .form-group
= field.label :name, s_('ClusterIntegration|Kubernetes cluster name'), class: 'label-light' = field.label :name, s_('ClusterIntegration|Kubernetes cluster name'), class: 'label-bold'
= field.text_field :name, class: 'form-control', placeholder: s_('ClusterIntegration|Kubernetes cluster name') = field.text_field :name, class: 'form-control', placeholder: s_('ClusterIntegration|Kubernetes cluster name')
- if has_multiple_clusters?(@project) - if has_multiple_clusters?(@project)
.form-group .form-group
= field.label :environment_scope, s_('ClusterIntegration|Environment scope'), class: 'label-light' = field.label :environment_scope, s_('ClusterIntegration|Environment scope'), class: 'label-bold'
= field.text_field :environment_scope, class: 'form-control', placeholder: s_('ClusterIntegration|Environment scope') = field.text_field :environment_scope, class: 'form-control', placeholder: s_('ClusterIntegration|Environment scope')
= field.fields_for :platform_kubernetes, @user_cluster.platform_kubernetes do |platform_kubernetes_field| = field.fields_for :platform_kubernetes, @user_cluster.platform_kubernetes do |platform_kubernetes_field|
.form-group .form-group
= platform_kubernetes_field.label :api_url, s_('ClusterIntegration|API URL'), class: 'label-light' = platform_kubernetes_field.label :api_url, s_('ClusterIntegration|API URL'), class: 'label-bold'
= platform_kubernetes_field.text_field :api_url, class: 'form-control', placeholder: s_('ClusterIntegration|API URL') = platform_kubernetes_field.text_field :api_url, class: 'form-control', placeholder: s_('ClusterIntegration|API URL')
.form-group .form-group
= platform_kubernetes_field.label :ca_cert, s_('ClusterIntegration|CA Certificate'), class: 'label-light' = platform_kubernetes_field.label :ca_cert, s_('ClusterIntegration|CA Certificate'), class: 'label-bold'
= platform_kubernetes_field.text_area :ca_cert, class: 'form-control', placeholder: s_('ClusterIntegration|Certificate Authority bundle (PEM format)') = platform_kubernetes_field.text_area :ca_cert, class: 'form-control', placeholder: s_('ClusterIntegration|Certificate Authority bundle (PEM format)')
.form-group .form-group
= platform_kubernetes_field.label :token, s_('ClusterIntegration|Token'), class: 'label-light' = platform_kubernetes_field.label :token, s_('ClusterIntegration|Token'), class: 'label-bold'
= platform_kubernetes_field.text_field :token, class: 'form-control', placeholder: s_('ClusterIntegration|Service token'), autocomplete: 'off' = platform_kubernetes_field.text_field :token, class: 'form-control', placeholder: s_('ClusterIntegration|Service token'), autocomplete: 'off'
.form-group .form-group
= platform_kubernetes_field.label :namespace, s_('ClusterIntegration|Project namespace (optional, unique)'), class: 'label-light' = platform_kubernetes_field.label :namespace, s_('ClusterIntegration|Project namespace (optional, unique)'), class: 'label-bold'
= platform_kubernetes_field.text_field :namespace, class: 'form-control', placeholder: s_('ClusterIntegration|Project namespace') = platform_kubernetes_field.text_field :namespace, class: 'form-control', placeholder: s_('ClusterIntegration|Project namespace')
.form-group .form-group
......
app/views/projects/clusters/user/_show.html.haml
View file @ db704770
= form_for @cluster, url: namespace_project_cluster_path(@project.namespace, @project, @cluster), as: :cluster do |field| = form_for @cluster, url: namespace_project_cluster_path(@project.namespace, @project, @cluster), as: :cluster do |field|
= form_errors(@cluster) = form_errors(@cluster)
.form-group .form-group
= field.label :name, s_('ClusterIntegration|Kubernetes cluster name'), class: 'label-light' = field.label :name, s_('ClusterIntegration|Kubernetes cluster name'), class: 'label-bold'
= field.text_field :name, class: 'form-control', placeholder: s_('ClusterIntegration|Kubernetes cluster name') = field.text_field :name, class: 'form-control', placeholder: s_('ClusterIntegration|Kubernetes cluster name')
= field.fields_for :platform_kubernetes, @cluster.platform_kubernetes do |platform_kubernetes_field| = field.fields_for :platform_kubernetes, @cluster.platform_kubernetes do |platform_kubernetes_field|
.form-group .form-group
= platform_kubernetes_field.label :api_url, s_('ClusterIntegration|API URL'), class: 'label-light' = platform_kubernetes_field.label :api_url, s_('ClusterIntegration|API URL'), class: 'label-bold'
= platform_kubernetes_field.text_field :api_url, class: 'form-control', placeholder: s_('ClusterIntegration|API URL') = platform_kubernetes_field.text_field :api_url, class: 'form-control', placeholder: s_('ClusterIntegration|API URL')
.form-group .form-group
= platform_kubernetes_field.label :ca_cert, s_('ClusterIntegration|CA Certificate'), class: 'label-light' = platform_kubernetes_field.label :ca_cert, s_('ClusterIntegration|CA Certificate'), class: 'label-bold'
= platform_kubernetes_field.text_area :ca_cert, class: 'form-control', placeholder: s_('ClusterIntegration|Certificate Authority bundle (PEM format)') = platform_kubernetes_field.text_area :ca_cert, class: 'form-control', placeholder: s_('ClusterIntegration|Certificate Authority bundle (PEM format)')
.form-group .form-group
= platform_kubernetes_field.label :token, s_('ClusterIntegration|Token'), class: 'label-light' = platform_kubernetes_field.label :token, s_('ClusterIntegration|Token'), class: 'label-bold'
.input-group .input-group
= platform_kubernetes_field.text_field :token, class: 'form-control js-cluster-token', type: 'password', placeholder: s_('ClusterIntegration|Token'), autocomplete: 'off' = platform_kubernetes_field.text_field :token, class: 'form-control js-cluster-token', type: 'password', placeholder: s_('ClusterIntegration|Token'), autocomplete: 'off'
%span.input-group-append.clipboard-addon %span.input-group-append.clipboard-addon
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
= s_('ClusterIntegration|Show') = s_('ClusterIntegration|Show')
.form-group .form-group
= platform_kubernetes_field.label :namespace, s_('ClusterIntegration|Project namespace (optional, unique)'), class: 'label-light' = platform_kubernetes_field.label :namespace, s_('ClusterIntegration|Project namespace (optional, unique)'), class: 'label-bold'
= platform_kubernetes_field.text_field :namespace, class: 'form-control', placeholder: s_('ClusterIntegration|Project namespace') = platform_kubernetes_field.text_field :namespace, class: 'form-control', placeholder: s_('ClusterIntegration|Project namespace')
.form-group .form-group
......
app/views/projects/commit/_change.html.haml
View file @ db704770
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%p= description %p= description
= form_tag [type.underscore, @project.namespace.becomes(Namespace), @project, commit], method: :post, remote: false, class: "js-#{type}-form js-requires-input" do = form_tag [type.underscore, @project.namespace.becomes(Namespace), @project, commit], method: :post, remote: false, class: "js-#{type}-form js-requires-input" do
.form-group.branch .form-group.branch
= label_tag 'start_branch', branch_label, class: 'label-light' = label_tag 'start_branch', branch_label, class: 'label-bold'
= hidden_field_tag :start_branch, @project.default_branch, id: 'start_branch' = hidden_field_tag :start_branch, @project.default_branch, id: 'start_branch'
= dropdown_tag(@project.default_branch, options: { title: s_("BranchSwitcherTitle|Switch branch"), filter: true, placeholder: s_("BranchSwitcherPlaceholder|Search branches"), toggle_class: 'js-project-refs-dropdown dynamic', dropdown_class: 'dropdown-menu-selectable', data: { field_name: "start_branch", selected: @project.default_branch, start_branch: @project.default_branch, refs_url: project_branches_path(@project), submit_form_on_click: false } }) = dropdown_tag(@project.default_branch, options: { title: s_("BranchSwitcherTitle|Switch branch"), filter: true, placeholder: s_("BranchSwitcherPlaceholder|Search branches"), toggle_class: 'js-project-refs-dropdown dynamic', dropdown_class: 'dropdown-menu-selectable', data: { field_name: "start_branch", selected: @project.default_branch, start_branch: @project.default_branch, refs_url: project_branches_path(@project), submit_form_on_click: false } })
......
app/views/projects/deploy_keys/_form.html.haml
View file @ db704770
= form_for [@project.namespace.becomes(Namespace), @project, @deploy_keys.new_key], url: namespace_project_deploy_keys_path, html: { class: "js-requires-input container" } do |f| = form_for [@project.namespace.becomes(Namespace), @project, @deploy_keys.new_key], url: namespace_project_deploy_keys_path, html: { class: "js-requires-input container" } do |f|
= form_errors(@deploy_keys.new_key) = form_errors(@deploy_keys.new_key)
.form-group.row .form-group.row
= f.label :title, class: "label-light" = f.label :title, class: "label-bold"
= f.text_field :title, class: 'form-control', required: true = f.text_field :title, class: 'form-control', required: true
.form-group.row .form-group.row
= f.label :key, class: "label-light" = f.label :key, class: "label-bold"
= f.text_area :key, class: "form-control", rows: 5, required: true = f.text_area :key, class: "form-control", rows: 5, required: true
.form-group.row .form-group.row
%p.light.append-bottom-0 %p.light.append-bottom-0
......
app/views/projects/deploy_tokens/_form.html.haml
View file @ db704770
...@@ -5,24 +5,24 @@ ...@@ -5,24 +5,24 @@
= form_errors(token) = form_errors(token)
.form-group .form-group
= f.label :name, class: 'label-light' = f.label :name, class: 'label-bold'
= f.text_field :name, class: 'form-control', required: true = f.text_field :name, class: 'form-control', required: true
.form-group .form-group
= f.label :expires_at, class: 'label-light' = f.label :expires_at, class: 'label-bold'
= f.text_field :expires_at, class: 'datepicker form-control', value: f.object.expires_at = f.text_field :expires_at, class: 'datepicker form-control', value: f.object.expires_at
.form-group .form-group
= f.label :scopes, class: 'label-light' = f.label :scopes, class: 'label-bold'
%fieldset.form-group.form-check %fieldset.form-group.form-check
= f.check_box :read_repository, class: 'form-check-input' = f.check_box :read_repository, class: 'form-check-input'
= label_tag ("deploy_token_read_repository"), 'read_repository', class: 'label-light form-check-label' = label_tag ("deploy_token_read_repository"), 'read_repository', class: 'label-bold form-check-label'
.text-secondary= s_('DeployTokens|Allows read-only access to the repository') .text-secondary= s_('DeployTokens|Allows read-only access to the repository')
- if container_registry_enabled?(project) - if container_registry_enabled?(project)
%fieldset.form-group.form-check %fieldset.form-group.form-check
= f.check_box :read_registry, class: 'form-check-input' = f.check_box :read_registry, class: 'form-check-input'
= label_tag ("deploy_token_read_registry"), 'read_registry', class: 'label-light form-check-label' = label_tag ("deploy_token_read_registry"), 'read_registry', class: 'label-bold form-check-label'
.text-secondary= s_('DeployTokens|Allows read-only access to the registry images') .text-secondary= s_('DeployTokens|Allows read-only access to the registry images')
.prepend-top-default .prepend-top-default
......
app/views/projects/edit.html.haml
View file @ db704770
...@@ -18,17 +18,17 @@ ...@@ -18,17 +18,17 @@
%fieldset %fieldset
.row .row
.form-group.col-md-9 .form-group.col-md-9
= f.label :name, class: 'label-light', for: 'project_name_edit' do = f.label :name, class: 'label-bold', for: 'project_name_edit' do
Project name Project name
= f.text_field :name, class: "form-control", id: "project_name_edit" = f.text_field :name, class: "form-control", id: "project_name_edit"
.form-group.col-md-3 .form-group.col-md-3
= f.label :id, class: 'label-light' do = f.label :id, class: 'label-bold' do
Project ID Project ID
= f.text_field :id, class: 'form-control', readonly: true = f.text_field :id, class: 'form-control', readonly: true
.form-group .form-group
= f.label :description, class: 'label-light' do = f.label :description, class: 'label-bold' do
Project description Project description
%span.light (optional) %span.light (optional)
= f.text_area :description, class: "form-control", rows: 3, maxlength: 250 = f.text_area :description, class: "form-control", rows: 3, maxlength: 250
...@@ -37,13 +37,13 @@ ...@@ -37,13 +37,13 @@
- unless @project.empty_repo? - unless @project.empty_repo?
.form-group .form-group
= f.label :default_branch, "Default Branch", class: 'label-light' = f.label :default_branch, "Default Branch", class: 'label-bold'
= f.select(:default_branch, @project.repository.branch_names, {}, {class: 'select2 select-wide'}) = f.select(:default_branch, @project.repository.branch_names, {}, {class: 'select2 select-wide'})
= render_if_exists 'shared/repository_size_limit_setting', form: f, type: :project = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :project
.form-group .form-group
= f.label :tag_list, "Tags", class: 'label-light' = f.label :tag_list, "Tags", class: 'label-bold'
= f.text_field :tag_list, value: @project.tag_list.sort.join(', '), maxlength: 2000, class: "form-control" = f.text_field :tag_list, value: @project.tag_list.sort.join(', '), maxlength: 2000, class: "form-control"
%p.form-text.text-muted Separate tags with commas. %p.form-text.text-muted Separate tags with commas.
%fieldset.features %fieldset.features
...@@ -144,12 +144,12 @@ ...@@ -144,12 +144,12 @@
= render 'projects/errors' = render 'projects/errors'
= form_for([@project.namespace.becomes(Namespace), @project]) do |f| = form_for([@project.namespace.becomes(Namespace), @project]) do |f|
.form-group.project_name_holder .form-group.project_name_holder
= f.label :name, class: 'label-light' do = f.label :name, class: 'label-bold' do
Project name Project name
.form-group .form-group
= f.text_field :name, class: "form-control" = f.text_field :name, class: "form-control"
.form-group .form-group
= f.label :path, class: 'label-light' do = f.label :path, class: 'label-bold' do
%span Path %span Path
.form-group .form-group
.input-group .input-group
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
Transfer project Transfer project
= form_for([@project.namespace.becomes(Namespace), @project], url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'js-project-transfer-form' } ) do |f| = form_for([@project.namespace.becomes(Namespace), @project], url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'js-project-transfer-form' } ) do |f|
.form-group .form-group
= label_tag :new_namespace_id, nil, class: 'label-light' do = label_tag :new_namespace_id, nil, class: 'label-bold' do
%span Select a new namespace %span Select a new namespace
.form-group .form-group
= select_tag :new_namespace_id, namespaces_options(nil), include_blank: true, class: 'select2' = select_tag :new_namespace_id, namespaces_options(nil), include_blank: true, class: 'select2'
......
app/views/projects/environments/_form.html.haml
View file @ db704770
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
= form_errors(@environment) = form_errors(@environment)
.form-group .form-group
= f.label :name, 'Name', class: 'label-light' = f.label :name, 'Name', class: 'label-bold'
= f.text_field :name, required: true, class: 'form-control' = f.text_field :name, required: true, class: 'form-control'
.form-group .form-group
= f.label :external_url, 'External URL', class: 'label-light' = f.label :external_url, 'External URL', class: 'label-bold'
= f.url_field :external_url, class: 'form-control' = f.url_field :external_url, class: 'form-control'
.form-actions .form-actions
......
app/views/projects/merge_requests/conflicts/_submit_form.html.haml
View file @ db704770
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
.resolve-info .resolve-info
= translation.html_safe = translation.html_safe
.col-md-8 .col-md-8
%label.label-light{ "for" => "commit-message" } %label.label-bold{ "for" => "commit-message" }
#{ _('Commit message') } #{ _('Commit message') }
.commit-message-container .commit-message-container
.max-width-marker .max-width-marker
......
app/views/projects/mirrors/_push.html.haml
View file @ db704770
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
.form-group .form-group
= rm_form.check_box :enabled, class: "float-left" = rm_form.check_box :enabled, class: "float-left"
.prepend-left-20 .prepend-left-20
= rm_form.label :enabled, "Remote mirror repository", class: "label-light append-bottom-0" = rm_form.label :enabled, "Remote mirror repository", class: "label-bold append-bottom-0"
%p.light.append-bottom-0 %p.light.append-bottom-0
Automatically update the remote mirror's branches, tags, and commits from this repository every time someone pushes to it. Automatically update the remote mirror's branches, tags, and commits from this repository every time someone pushes to it.
.form-group.has-feedback .form-group.has-feedback
= rm_form.label :url, "Git repository URL", class: "label-light" = rm_form.label :url, "Git repository URL", class: "label-bold"
= rm_form.text_field :url, class: "form-control", placeholder: 'https://username:password@gitlab.company.com/group/project.git' = rm_form.text_field :url, class: "form-control", placeholder: 'https://username:password@gitlab.company.com/group/project.git'
= render "projects/mirrors/instructions" = render "projects/mirrors/instructions"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
.form-group .form-group
= rm_form.check_box :only_protected_branches, class: 'float-left' = rm_form.check_box :only_protected_branches, class: 'float-left'
.prepend-left-20 .prepend-left-20
= rm_form.label :only_protected_branches, class: 'label-light' = rm_form.label :only_protected_branches, class: 'label-bold'
= link_to icon('question-circle'), help_page_path('user/project/protected_branches') = link_to icon('question-circle'), help_page_path('user/project/protected_branches')
= f.submit 'Save changes', class: 'btn btn-create', name: 'update_remote_mirror' = f.submit 'Save changes', class: 'btn btn-create', name: 'update_remote_mirror'
app/views/projects/pipeline_schedules/_form.html.haml
View file @ db704770
...@@ -2,25 +2,25 @@ ...@@ -2,25 +2,25 @@
= form_errors(@schedule) = form_errors(@schedule)
.form-group.row .form-group.row
.col-md-9 .col-md-9
= f.label :description, _('Description'), class: 'label-light' = f.label :description, _('Description'), class: 'label-bold'
= f.text_field :description, class: 'form-control', required: true, autofocus: true, placeholder: s_('PipelineSchedules|Provide a short description for this pipeline') = f.text_field :description, class: 'form-control', required: true, autofocus: true, placeholder: s_('PipelineSchedules|Provide a short description for this pipeline')
.form-group.row .form-group.row
.col-md-9 .col-md-9
= f.label :cron, _('Interval Pattern'), class: 'label-light' = f.label :cron, _('Interval Pattern'), class: 'label-bold'
#interval-pattern-input{ data: { initial_interval: @schedule.cron } } #interval-pattern-input{ data: { initial_interval: @schedule.cron } }
.form-group.row .form-group.row
.col-md-9 .col-md-9
= f.label :cron_timezone, _('Cron Timezone'), class: 'label-light' = f.label :cron_timezone, _('Cron Timezone'), class: 'label-bold'
= dropdown_tag(_("Select a timezone"), options: { toggle_class: 'btn js-timezone-dropdown', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } ) = dropdown_tag(_("Select a timezone"), options: { toggle_class: 'btn js-timezone-dropdown', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } )
= f.text_field :cron_timezone, value: @schedule.cron_timezone, id: 'schedule_cron_timezone', class: 'hidden', name: 'schedule[cron_timezone]', required: true = f.text_field :cron_timezone, value: @schedule.cron_timezone, id: 'schedule_cron_timezone', class: 'hidden', name: 'schedule[cron_timezone]', required: true
.form-group.row .form-group.row
.col-md-9 .col-md-9
= f.label :ref, _('Target Branch'), class: 'label-light' = f.label :ref, _('Target Branch'), class: 'label-bold'
= dropdown_tag(_("Select target branch"), options: { toggle_class: 'btn js-target-branch-dropdown', dropdown_class: 'git-revision-dropdown', title: _("Select target branch"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: @project.repository.branch_names, default_branch: @project.default_branch } } ) = dropdown_tag(_("Select target branch"), options: { toggle_class: 'btn js-target-branch-dropdown', dropdown_class: 'git-revision-dropdown', title: _("Select target branch"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: @project.repository.branch_names, default_branch: @project.default_branch } } )
= f.text_field :ref, value: @schedule.ref, id: 'schedule_ref', class: 'hidden', name: 'schedule[ref]', required: true = f.text_field :ref, value: @schedule.ref, id: 'schedule_ref', class: 'hidden', name: 'schedule[ref]', required: true
.form-group.row.js-ci-variable-list-section .form-group.row.js-ci-variable-list-section
.col-md-9 .col-md-9
%label.label-light %label.label-bold
#{ s_('PipelineSchedules|Variables') } #{ s_('PipelineSchedules|Variables') }
%ul.ci-variable-list %ul.ci-variable-list
- @schedule.variables.each do |variable| - @schedule.variables.each do |variable|
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
= n_('Reveal value', 'Reveal values', @schedule.variables.size) = n_('Reveal value', 'Reveal values', @schedule.variables.size)
.form-group.row .form-group.row
.col-md-9 .col-md-9
= f.label :active, s_('PipelineSchedules|Activated'), class: 'label-light' = f.label :active, s_('PipelineSchedules|Activated'), class: 'label-bold'
%div %div
= f.check_box :active, required: false, value: @schedule.active? = f.check_box :active, required: false, value: @schedule.active?
= _('Active') = _('Active')
......
app/views/projects/project_members/_new_project_member.html.haml
View file @ db704770
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
.col-sm-12 .col-sm-12
= form_for @project_member, as: :project_member, url: project_project_members_path(@project), html: { class: 'users-project-form' } do |f| = form_for @project_member, as: :project_member, url: project_project_members_path(@project), html: { class: 'users-project-form' } do |f|
.form-group .form-group
= label_tag :user_ids, "Select members to invite", class: "label-light" = label_tag :user_ids, "Select members to invite", class: "label-bold"
= users_select_tag(:user_ids, multiple: true, class: "input-clamp", scope: :all, email_user: true, placeholder: "Search for members to update or invite") = users_select_tag(:user_ids, multiple: true, class: "input-clamp", scope: :all, email_user: true, placeholder: "Search for members to update or invite")
.form-group .form-group
= label_tag :access_level, "Choose a role permission", class: "label-light" = label_tag :access_level, "Choose a role permission", class: "label-bold"
.select-wrapper .select-wrapper
= select_tag :access_level, options_for_select(ProjectMember.access_level_roles, @project_member.access_level), class: "form-control project-access-select select-control" = select_tag :access_level, options_for_select(ProjectMember.access_level_roles, @project_member.access_level), class: "form-control project-access-select select-control"
= icon('chevron-down') = icon('chevron-down')
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
about role permissions about role permissions
.form-group .form-group
.clearable-input .clearable-input
= label_tag :expires_at, 'Access expiration date', class: 'label-light' = label_tag :expires_at, 'Access expiration date', class: 'label-bold'
= text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date', placeholder: 'Expiration date' = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date', placeholder: 'Expiration date'
%i.clear-icon.js-clear-input %i.clear-icon.js-clear-input
= f.submit "Add to project", class: "btn btn-create" = f.submit "Add to project", class: "btn btn-create"
......
app/views/projects/project_members/_new_shared_group.html.haml
View file @ db704770
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
.col-sm-12 .col-sm-12
= form_tag project_group_links_path(@project), class: 'js-requires-input', method: :post do = form_tag project_group_links_path(@project), class: 'js-requires-input', method: :post do
.form-group .form-group
= label_tag :link_group_id, "Select a group to share with", class: "label-light" = label_tag :link_group_id, "Select a group to share with", class: "label-bold"
= groups_select_tag(:link_group_id, data: { skip_groups: @skip_groups }, class: "input-clamp", required: true) = groups_select_tag(:link_group_id, data: { skip_groups: @skip_groups }, class: "input-clamp", required: true)
.form-group .form-group
= label_tag :link_group_access, "Max access level", class: "label-light" = label_tag :link_group_access, "Max access level", class: "label-bold"
.select-wrapper .select-wrapper
= select_tag :link_group_access, options_for_select(ProjectGroupLink.access_options, ProjectGroupLink.default_access), class: "form-control select-control" = select_tag :link_group_access, options_for_select(ProjectGroupLink.access_options, ProjectGroupLink.default_access), class: "form-control select-control"
= icon('chevron-down') = icon('chevron-down')
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
= link_to "Read more", help_page_path("user/permissions"), class: "vlink" = link_to "Read more", help_page_path("user/permissions"), class: "vlink"
about role permissions about role permissions
.form-group .form-group
= label_tag :expires_at, 'Access expiration date', class: 'label-light' = label_tag :expires_at, 'Access expiration date', class: 'label-bold'
.clearable-input .clearable-input
= text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date-groups', placeholder: 'Expiration date', id: 'expires_at_groups' = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date-groups', placeholder: 'Expiration date', id: 'expires_at_groups'
%i.clear-icon.js-clear-input %i.clear-icon.js-clear-input
......
app/views/projects/settings/ci_cd/_form.html.haml
View file @ db704770
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
= form_errors(@project) = form_errors(@project)
%fieldset.builds-feature %fieldset.builds-feature
.form-group.append-bottom-default.js-secret-runner-token .form-group.append-bottom-default.js-secret-runner-token
= f.label :runners_token, _("Runner token"), class: 'label-light' = f.label :runners_token, _("Runner token"), class: 'label-bold'
.form-control.js-secret-value-placeholder .form-control.js-secret-value-placeholder
= '*' * 20 = '*' * 20
= f.text_field :runners_token, class: "form-control hide js-secret-value", placeholder: 'xEeFCaDAB89' = f.text_field :runners_token, class: "form-control hide js-secret-value", placeholder: 'xEeFCaDAB89'
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
%hr %hr
.form-group .form-group
= f.label :build_timeout_human_readable, _('Timeout'), class: 'label-light' = f.label :build_timeout_human_readable, _('Timeout'), class: 'label-bold'
= f.text_field :build_timeout_human_readable, class: 'form-control' = f.text_field :build_timeout_human_readable, class: 'form-control'
%p.form-text.text-muted %p.form-text.text-muted
= _("Per job. If a job passes this threshold, it will be marked as failed") = _("Per job. If a job passes this threshold, it will be marked as failed")
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
%hr %hr
.form-group .form-group
= f.label :ci_config_path, _('Custom CI config path'), class: 'label-light' = f.label :ci_config_path, _('Custom CI config path'), class: 'label-bold'
= f.text_field :ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml' = f.text_field :ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml'
%p.form-text.text-muted %p.form-text.text-muted
= _("The path to CI config file. Defaults to <code>.gitlab-ci.yml</code>") = _("The path to CI config file. Defaults to <code>.gitlab-ci.yml</code>")
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
%hr %hr
.form-group .form-group
= f.label :build_coverage_regex, _("Test coverage parsing"), class: 'label-light' = f.label :build_coverage_regex, _("Test coverage parsing"), class: 'label-bold'
.input-group .input-group
%span.input-group-prepend %span.input-group-prepend
.input-group-text / .input-group-text /
......
app/views/projects/triggers/_form.html.haml
View file @ db704770
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
- if @trigger.token - if @trigger.token
.form-group .form-group
%label.label-light Token %label.label-bold Token
%p.form-control-plaintext= @trigger.token %p.form-control-plaintext= @trigger.token
.form-group .form-group
= f.label :key, "Description", class: "label-light" = f.label :key, "Description", class: "label-bold"
= f.text_field :description, class: "form-control", required: true, title: 'Trigger description is required.', placeholder: "Trigger description" = f.text_field :description, class: "form-control", required: true, title: 'Trigger description is required.', placeholder: "Trigger description"
= f.submit btn_text, class: "btn btn-save" = f.submit btn_text, class: "btn btn-save"
app/views/shared/_import_form.html.haml
View file @ db704770
- ci_cd_only = local_assigns.fetch(:ci_cd_only, false) - ci_cd_only = local_assigns.fetch(:ci_cd_only, false)
.form-group.import-url-data .form-group.import-url-data
= f.label :import_url, class: 'label-light' do = f.label :import_url, class: 'label-bold' do
%span %span
= _('Git repository URL') = _('Git repository URL')
......
app/views/shared/_personal_access_tokens_form.html.haml
View file @ db704770
...@@ -11,18 +11,18 @@ ...@@ -11,18 +11,18 @@
.row .row
.form-group.col-md-6 .form-group.col-md-6
= f.label :name, class: 'label-light' = f.label :name, class: 'label-bold'
= f.text_field :name, class: "form-control", required: true = f.text_field :name, class: "form-control", required: true
.row .row
.form-group.col-md-6 .form-group.col-md-6
= f.label :expires_at, class: 'label-light' = f.label :expires_at, class: 'label-bold'
.input-icon-wrapper .input-icon-wrapper
= f.text_field :expires_at, class: "datepicker form-control", placeholder: 'YYYY-MM-DD' = f.text_field :expires_at, class: "datepicker form-control", placeholder: 'YYYY-MM-DD'
= icon('calendar', { class: 'input-icon-right' }) = icon('calendar', { class: 'input-icon-right' })
.form-group .form-group
= f.label :scopes, class: 'label-light' = f.label :scopes, class: 'label-bold'
= render 'shared/tokens/scopes_form', prefix: 'personal_access_token', token: token, scopes: scopes = render 'shared/tokens/scopes_form', prefix: 'personal_access_token', token: token, scopes: scopes
.prepend-top-default .prepend-top-default
......
app/views/shared/tokens/_scopes_form.html.haml
View file @ db704770
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
- scopes.each do |scope| - scopes.each do |scope|
%fieldset.form-group.form-check %fieldset.form-group.form-check
= check_box_tag "#{prefix}[scopes][]", scope, token.scopes.include?(scope), id: "#{prefix}_scopes_#{scope}", class: 'form-check-input' = check_box_tag "#{prefix}[scopes][]", scope, token.scopes.include?(scope), id: "#{prefix}_scopes_#{scope}", class: 'form-check-input'
= label_tag ("#{prefix}_scopes_#{scope}"), scope, class: 'label-light form-check-label' = label_tag ("#{prefix}_scopes_#{scope}"), scope, class: 'label-bold form-check-label'
.text-secondary= t scope, scope: [:doorkeeper, :scope_desc] .text-secondary= t scope, scope: [:doorkeeper, :scope_desc]
app/views/shared/web_hooks/_form.html.haml
View file @ db704770
= form_errors(hook) = form_errors(hook)
.form-group .form-group
= form.label :url, 'URL', class: 'label-light' = form.label :url, 'URL', class: 'label-bold'
= form.text_field :url, class: 'form-control', placeholder: 'http://example.com/trigger-ci.json' = form.text_field :url, class: 'form-control', placeholder: 'http://example.com/trigger-ci.json'
.form-group .form-group
= form.label :token, 'Secret Token', class: 'label-light' = form.label :token, 'Secret Token', class: 'label-bold'
= form.text_field :token, class: 'form-control', placeholder: '' = form.text_field :token, class: 'form-control', placeholder: ''
%p.form-text.text-muted %p.form-text.text-muted
Use this token to validate received payloads. It will be sent with the request in the X-Gitlab-Token HTTP header. Use this token to validate received payloads. It will be sent with the request in the X-Gitlab-Token HTTP header.
.form-group .form-group
= form.label :url, 'Trigger', class: 'label-light' = form.label :url, 'Trigger', class: 'label-bold'
%ul.list-unstyled.prepend-left-20 %ul.list-unstyled.prepend-left-20
%li %li
= form.check_box :push_events, class: 'form-check-input' = form.check_box :push_events, class: 'form-check-input'
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
%p.light.ml-1 %p.light.ml-1
This URL will be triggered when a wiki page is created/updated This URL will be triggered when a wiki page is created/updated
.form-group .form-group
= form.label :enable_ssl_verification, 'SSL verification', class: 'label-light checkbox' = form.label :enable_ssl_verification, 'SSL verification', class: 'label-bold checkbox'
.form-check .form-check
= form.check_box :enable_ssl_verification, class: 'form-check-input' = form.check_box :enable_ssl_verification, class: 'form-check-input'
= form.label :enable_ssl_verification, class: 'form-check-label ml-1' do = form.label :enable_ssl_verification, class: 'form-check-label ml-1' do
......
config/initializers/bootstrap_form.rb
View file @ db704770
module BootstrapFormBuilderCustomization module BootstrapFormBuilderCustomization
def label_class def label_class
"label-light" "label-bold"
end end
end end
......
ee/app/assets/javascripts/boards/components/board_form.vue
View file @ db704770
...@@ -228,7 +228,7 @@ export default { ...@@ -228,7 +228,7 @@ export default {
class="append-bottom-20" class="append-bottom-20"
> >
<label <label
class="form-section-title label-light" class="form-section-title label-bold"
for="board-new-name" for="board-new-name"
> >
Board name Board name
...@@ -248,7 +248,7 @@ export default { ...@@ -248,7 +248,7 @@ export default {
v-if="canAdminBoard" v-if="canAdminBoard"
class="media append-bottom-10" class="media append-bottom-10"
> >
<label class="form-section-title label-light media-body"> <label class="form-section-title label-bold media-body">
Board scope Board scope
</label> </label>
<button <button
......
ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
View file @ db704770
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
Search with Elasticsearch enabled Search with Elasticsearch enabled
.form-group .form-group
= f.label :elasticsearch_url, 'URL', class: 'label-light' = 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' = f.text_field :elasticsearch_url, value: @application_setting.elasticsearch_url.join(', '), class: 'form-control', placeholder: 'http://localhost:9200'
.form-text.text-muted .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"). The url to use for connecting to Elasticsearch. Use a comma-separated list to support clustering (e.g., "http://localhost:9200, http://localhost:9201").
...@@ -38,19 +38,19 @@ ...@@ -38,19 +38,19 @@
= f.label :elasticsearch_aws, class: 'form-check-label' do = f.label :elasticsearch_aws, class: 'form-check-label' do
Using AWS hosted Elasticsearch with IAM credentials Using AWS hosted Elasticsearch with IAM credentials
.form-group .form-group
= f.label :elasticsearch_aws_region, 'AWS region', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Region that elasticsearch is configured Region that elasticsearch is configured
.form-group .form-group
= f.label :elasticsearch_aws_access_key, 'AWS Access Key', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
AWS Access Key. Only required if not using role instance credentials AWS Access Key. Only required if not using role instance credentials
.form-group .form-group
= f.label :elasticsearch_aws_secret_access_key, 'AWS Secret Access Key', class: 'label-light' = f.label :elasticsearch_aws_secret_access_key, 'AWS Secret Access Key', class: 'label-bold'
= f.password_field :elasticsearch_aws_secret_access_key, value: @application_setting.elasticsearch_aws_secret_access_key, class: 'form-control' = f.password_field :elasticsearch_aws_secret_access_key, value: @application_setting.elasticsearch_aws_secret_access_key, class: 'form-control'
.form-text.text-muted .form-text.text-muted
AWS Secret Access Key. Only required if not using role instance credentials AWS Secret Access Key. Only required if not using role instance credentials
......
ee/app/views/admin/application_settings/_external_authorization_service_form.html.haml
View file @ db704770
...@@ -11,31 +11,31 @@ ...@@ -11,31 +11,31 @@
= external_authorization_description = external_authorization_description
= link_to icon('question-circle'), help_page_path('user/admin_area/settings/external_authorization') = link_to icon('question-circle'), help_page_path('user/admin_area/settings/external_authorization')
.form-group .form-group
= f.label :external_authorization_service_url, _('Service URL'), class: 'label-light' = 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'
%span.form-text.text-muted %span.form-text.text-muted
= external_authorization_url_help_text = external_authorization_url_help_text
.form-group .form-group
= f.label :external_authorization_service_timeout, _('External authorization request timeout'), class: 'label-light' = 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', min: 0.001, max: 10, step: 0.001
%span.form-text.text-muted %span.form-text.text-muted
= external_authorization_timeout_help_text = external_authorization_timeout_help_text
= f.label :external_auth_client_cert, _('Client authentication certificate'), class: 'label-light' = 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'
%span.form-text.text-muted %span.form-text.text-muted
= external_authorization_client_certificate_help_text = external_authorization_client_certificate_help_text
.form-group .form-group
= f.label :external_auth_client_key, _('Client authentication key'), class: 'label-light' = 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'
%span.form-text.text-muted %span.form-text.text-muted
= external_authorization_client_key_help_text = external_authorization_client_key_help_text
.form-group .form-group
= f.label :external_auth_client_key_pass, _('Client authentication key password'), class: 'label-light' = 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'
%span.form-text.text-muted %span.form-text.text-muted
= external_authorization_client_pass_help_text = external_authorization_client_pass_help_text
.form-group .form-group
= f.label :external_authorization_service_default_label, _('Default classification label'), class: 'label-light' = 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'
= f.submit 'Save changes', class: "btn btn-success" = f.submit 'Save changes', class: "btn btn-success"
ee/app/views/admin/application_settings/_geo.html.haml
View file @ db704770
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
%p %p
These settings will only take effect if Geo is enabled and require a restart to take effect. These settings will only take effect if Geo is enabled and require a restart to take effect.
.form-group .form-group
= f.label :geo_status_timeout, 'Connection timeout', class: 'label-light' = f.label :geo_status_timeout, 'Connection timeout', class: 'label-bold'
= f.number_field :geo_status_timeout, class: 'form-control' = f.number_field :geo_status_timeout, class: 'form-control'
.form-text.text-muted .form-text.text-muted
The amount of seconds after which a request to get a secondary node The amount of seconds after which a request to get a secondary node
......
ee/app/views/admin/application_settings/_mirror_settings.html.haml
View file @ db704770
.form-group .form-group
= f.label :mirror_max_delay, class: 'label-light' do = f.label :mirror_max_delay, class: 'label-bold' do
Maximum delay (Minutes) Maximum delay (Minutes)
= f.number_field :mirror_max_delay, class: 'form-control', min: 0 = f.number_field :mirror_max_delay, class: 'form-control', min: 0
%span.form-text.text-muted#mirror_max_delay_help_block %span.form-text.text-muted#mirror_max_delay_help_block
Maximum time between updates that a mirror can have when scheduled to synchronize. Maximum time between updates that a mirror can have when scheduled to synchronize.
.form-group .form-group
= f.label :mirror_max_capacity, class: 'label-light' do = f.label :mirror_max_capacity, class: 'label-bold' do
Maximum capacity Maximum capacity
= f.number_field :mirror_max_capacity, class: 'form-control', min: 0 = f.number_field :mirror_max_capacity, class: 'form-control', min: 0
%span.form-text.text-muted#mirror_max_capacity_help_block %span.form-text.text-muted#mirror_max_capacity_help_block
Maximum number of mirrors that can be synchronizing at the same time. Maximum number of mirrors that can be synchronizing at the same time.
.form-group .form-group
= f.label :mirror_capacity_threshold, class: 'label-light' do = f.label :mirror_capacity_threshold, class: 'label-bold' do
Capacity threshold Capacity threshold
= f.number_field :mirror_capacity_threshold, class: 'form-control', min: 0 = f.number_field :mirror_capacity_threshold, class: 'form-control', min: 0
%span.form-text.text-muted#mirror_capacity_threshold %span.form-text.text-muted#mirror_capacity_threshold
......
ee/app/views/admin/application_settings/_repository_size_limit_setting.html.haml
View file @ db704770
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
- form = local_assigns.fetch(:form) - form = local_assigns.fetch(:form)
.form-group .form-group
= form.label :repository_size_limit, class: 'label-light' do = form.label :repository_size_limit, class: 'label-bold' do
Size limit per repository (MB) 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 = form.number_field :repository_size_limit, value: form.object.repository_size_limit.try(:to_mb), class: 'form-control', min: 0
%span.form-text.text-muted#repository_size_limit_help_block %span.form-text.text-muted#repository_size_limit_help_block
......
ee/app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml
View file @ db704770
.form-group .form-group
= form.label :shared_runners_minutes, 'Pipeline minutes quota', class: 'label-light' = 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'
.form-text.text-muted .form-text.text-muted
Set the maximum number of pipeline minutes that a group can use on shared Runners per month. Set the maximum number of pipeline minutes that a group can use on shared Runners per month.
......
ee/app/views/admin/application_settings/_slack.html.haml
View file @ db704770
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
.form-text.text-muted .form-text.text-muted
This option is only available on GitLab.com This option is only available on GitLab.com
.form-group .form-group
= f.label :slack_app_id, 'APP_ID', class: 'label-light' = 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'
.form-group .form-group
= f.label :slack_app_secret, 'APP_SECRET', class: 'label-light' = 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'
.form-group .form-group
= f.label :slack_app_verification_token, 'Verification token', class: 'label-light' = 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'
= f.submit 'Save changes', class: "btn btn-success" = f.submit 'Save changes', class: "btn btn-success"
ee/app/views/admin/application_settings/ee/_project_creation_level.html.haml
View file @ db704770
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
- form = local_assigns.fetch(:form) - form = local_assigns.fetch(:form)
- application_setting = local_assigns.fetch(:application_setting) - application_setting = local_assigns.fetch(:application_setting)
.form-group .form-group
= form.label s_('ProjectCreationLevel|Default project creation protection'), class: 'label-light' = form.label s_('ProjectCreationLevel|Default project creation protection'), class: 'label-bold'
= form.select :default_project_creation, options_for_select(Gitlab::Access.project_creation_options, application_setting.default_project_creation), {}, class: 'form-control' = form.select :default_project_creation, options_for_select(Gitlab::Access.project_creation_options, application_setting.default_project_creation), {}, class: 'form-control'
ee/app/views/projects/_classification_policy_settings.html.haml
View file @ db704770
- if ::EE::Gitlab::ExternalAuthorization.enabled? - if ::EE::Gitlab::ExternalAuthorization.enabled?
.form-group .form-group
= f.label :external_authorization_classification_label, class: 'label-light' do = f.label :external_authorization_classification_label, class: 'label-bold' do
= s_('ExternalAuthorizationService|Classification Label') = s_('ExternalAuthorizationService|Classification Label')
%span.light (optional) %span.light (optional)
= f.text_field :external_authorization_classification_label, class: "form-control" = f.text_field :external_authorization_classification_label, class: "form-control"
......
ee/app/views/projects/_issues_settings.html.haml
View file @ db704770
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.settings-content .settings-content
= form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "issue-settings-form" }, authenticity_token: true do |f| = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "issue-settings-form" }, authenticity_token: true do |f|
.form-group .form-group
= f.label :issues_template, class: 'label-light' do = f.label :issues_template, class: 'label-bold' do
Default description template for issues Default description template for issues
= link_to icon('question-circle'), help_page_path('user/project/description_templates', anchor: 'setting-a-default-template-for-issues-and-merge-requests'), target: '_blank' = link_to icon('question-circle'), help_page_path('user/project/description_templates', anchor: 'setting-a-default-template-for-issues-and-merge-requests'), target: '_blank'
= f.text_area :issues_template, class: "form-control", rows: 3 = f.text_area :issues_template, class: "form-control", rows: 3
......
ee/app/views/projects/_merge_request_approvals_settings.html.haml
View file @ db704770
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.nested-settings .nested-settings
.form-group .form-group
= form.label :approver_ids, class: 'label-light' do = form.label :approver_ids, class: 'label-bold' do
Approvers Approvers
= hidden_field_tag "project[approver_ids]" = hidden_field_tag "project[approver_ids]"
= hidden_field_tag "project[approver_group_ids]" = hidden_field_tag "project[approver_group_ids]"
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
%li There are no approvers %li There are no approvers
.form-group .form-group
= form.label :approvals_before_merge, class: 'label-light' do = form.label :approvals_before_merge, class: 'label-bold' do
Approvals required Approvals required
= form.number_field :approvals_before_merge, class: "form-control", min: 0 = form.number_field :approvals_before_merge, class: "form-control", min: 0
.form-text.text-muted .form-text.text-muted
......
ee/app/views/projects/_merge_request_settings.html.haml
View file @ db704770
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- if @project.feature_available?(:issuable_default_templates) - if @project.feature_available?(:issuable_default_templates)
.form-group .form-group
= form.label :merge_requests_template, class: 'label-light' do = form.label :merge_requests_template, class: 'label-bold' do
Default description template for merge requests Default description template for merge requests
= link_to icon('question-circle'), help_page_path('user/project/description_templates', anchor: 'setting-a-default-template-for-issues-and-merge-requests'), target: '_blank' = link_to icon('question-circle'), help_page_path('user/project/description_templates', anchor: 'setting-a-default-template-for-issues-and-merge-requests'), target: '_blank'
= form.text_area :merge_requests_template, class: "form-control", rows: 3 = form.text_area :merge_requests_template, class: "form-control", rows: 3
......
ee/app/views/projects/_new_ci_cd_only_project_pane.html.haml
View file @ db704770
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
= _('If using GitHub, you’ll see pipeline statuses on GitHub for your commits and pull requests. %{more_info_link}').html_safe % { more_info_link: more_info_link } = _('If using GitHub, you’ll see pipeline statuses on GitHub for your commits and pull requests. %{more_info_link}').html_safe % { more_info_link: more_info_link }
.form-group.import-btn-container.prepend-top-20.clearfix .form-group.import-btn-container.prepend-top-20.clearfix
= f.label :visibility_level, class: 'label-light' do = f.label :visibility_level, class: 'label-bold' do
= s_('ImportButtons|Connect repositories from') = s_('ImportButtons|Connect repositories from')
.import-buttons .import-buttons
%div %div
......
ee/app/views/projects/mirrors/_pull.html.haml
View file @ db704770
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
.form-group .form-group
= f.check_box :mirror, class: "float-left" = f.check_box :mirror, class: "float-left"
.prepend-left-20 .prepend-left-20
= f.label :mirror, "Mirror repository", class: "label-light append-bottom-0" = f.label :mirror, "Mirror repository", class: "label-bold append-bottom-0"
.form-group .form-group
= f.label :username_only_import_url, "Git repository URL", class: "label-light" = f.label :username_only_import_url, "Git repository URL", class: "label-bold"
= f.text_field :username_only_import_url, class: 'form-control js-repo-url', placeholder: 'https://username@gitlab.company.com/group/project.git', required: 'required', pattern: "(#{protocols}):\/\/.+", title: 'URL must have protocol present (eg; ssh://...)' = f.text_field :username_only_import_url, class: 'form-control js-repo-url', placeholder: 'https://username@gitlab.company.com/group/project.git', required: 'required', pattern: "(#{protocols}):\/\/.+", title: 'URL must have protocol present (eg; ssh://...)'
= render "projects/mirrors/instructions" = render "projects/mirrors/instructions"
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
= render partial: "projects/mirrors/pull/authentication_method", locals: { f: import_form } = render partial: "projects/mirrors/pull/authentication_method", locals: { f: import_form }
.form-group .form-group
= f.label :mirror_user_id, "Mirror user", class: "label-light" = f.label :mirror_user_id, "Mirror user", class: "label-bold"
= select_tag('project[mirror_user_id]', options_for_mirror_user, class: "select2 lg", required: true) = select_tag('project[mirror_user_id]', options_for_mirror_user, class: "select2 lg", required: true)
.form-text.text-muted .form-text.text-muted
This user will be the author of all events in the activity feed that are the result of an update, This user will be the author of all events in the activity feed that are the result of an update,
...@@ -44,13 +44,13 @@ ...@@ -44,13 +44,13 @@
.form-group .form-group
= f.check_box :only_mirror_protected_branches, class: 'float-left' = f.check_box :only_mirror_protected_branches, class: 'float-left'
.prepend-left-20 .prepend-left-20
= f.label :only_mirror_protected_branches, class: 'label-light' = f.label :only_mirror_protected_branches, class: 'label-bold'
= link_to icon('question-circle'), help_page_path('user/project/protected_branches') = link_to icon('question-circle'), help_page_path('user/project/protected_branches')
.form-group .form-group
= f.check_box :mirror_overwrites_diverged_branches, class: 'float-left' = f.check_box :mirror_overwrites_diverged_branches, class: 'float-left'
.prepend-left-20 .prepend-left-20
= f.label :mirror_overwrites_diverged_branches, "Overwrite diverged branches", class: 'label-light' = f.label :mirror_overwrites_diverged_branches, "Overwrite diverged branches", class: 'label-bold'
.form-text.text-muted .form-text.text-muted
If disabled, a diverged local branch will not be automatically updated with commits from its remote counterpart, If disabled, a diverged local branch will not be automatically updated with commits from its remote counterpart,
to prevent local data loss. If the default branch (#{@project.default_branch}) has diverged and cannot be updated, to prevent local data loss. If the default branch (#{@project.default_branch}) has diverged and cannot be updated,
......
ee/app/views/projects/mirrors/pull/_authentication_method.html.haml
View file @ db704770
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- ssh_public_key_present = import_data.ssh_public_key.present? - ssh_public_key_present = import_data.ssh_public_key.present?
.form-group .form-group
= f.label :auth_method, 'Authentication method', class: 'label-light' = f.label :auth_method, 'Authentication method', class: 'label-bold'
= f.select :auth_method, = f.select :auth_method,
options_for_select([['Password authentication', 'password'], ['SSH public key authentication', 'ssh_public_key']], import_data.auth_method), options_for_select([['Password authentication', 'password'], ['SSH public key authentication', 'ssh_public_key']], import_data.auth_method),
{}, { class: "form-control js-pull-mirror-auth-type #{'hidden' unless import_data.ssh_import?}" } {}, { class: "form-control js-pull-mirror-auth-type #{'hidden' unless import_data.ssh_import?}" }
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
.account-well.changing-auth-method.hidden.js-well-changing-auth .account-well.changing-auth-method.hidden.js-well-changing-auth
= icon('spinner spin lg') = icon('spinner spin lg')
.account-well.well-password-auth.hidden.js-well-password-auth .account-well.well-password-auth.hidden.js-well-password-auth
= f.label :password, "Password", class: "label-light" = f.label :password, "Password", class: "label-bold"
= f.password_field :password, value: import_data.password, class: 'form-control' = f.password_field :password, value: import_data.password, class: 'form-control'
.account-well.well-ssh-auth.hidden.js-well-ssh-auth .account-well.well-ssh-auth.hidden.js-well-ssh-auth
%p.js-ssh-public-key-present{ class: ('hidden' unless ssh_public_key_present) } %p.js-ssh-public-key-present{ class: ('hidden' unless ssh_public_key_present) }
......
ee/app/views/projects/mirrors/pull/_ssh_host_keys.html.haml
View file @ db704770
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
= icon('spinner spin', class: 'detect-host-keys-load-spinner hidden') = icon('spinner spin', class: 'detect-host-keys-load-spinner hidden')
Detect host keys Detect host keys
.fingerprint-ssh-info.js-fingerprint-ssh-info{ class: ('hidden' unless import_data.ssh_import?) } .fingerprint-ssh-info.js-fingerprint-ssh-info{ class: ('hidden' unless import_data.ssh_import?) }
%label.label-light %label.label-bold
Fingerprints Fingerprints
.fingerprints-list.js-fingerprints-list .fingerprints-list.js-fingerprints-list
- import_data.ssh_known_hosts_fingerprints.each do |fp| - import_data.ssh_known_hosts_fingerprints.each do |fp|
...@@ -30,5 +30,5 @@ ...@@ -30,5 +30,5 @@
Hide advanced Hide advanced
= icon('chevron') = icon('chevron')
.js-ssh-known-hosts.hidden .js-ssh-known-hosts.hidden
= f.label :ssh_known_hosts, 'SSH host keys', class: 'label-light' = f.label :ssh_known_hosts, 'SSH host keys', class: 'label-bold'
= f.text_area :ssh_known_hosts, class: 'form-control known-hosts js-known-hosts', rows: '10' = f.text_area :ssh_known_hosts, class: 'form-control known-hosts js-known-hosts', rows: '10'
ee/app/views/projects/prometheus/metrics/_form.html.haml
View file @ db704770
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
= form_for [project.namespace.becomes(Namespace), project, metric], html: { class: 'col-lg-8 offset-lg-2' } do |f| = form_for [project.namespace.becomes(Namespace), project, metric], html: { class: 'col-lg-8 offset-lg-2' } do |f|
= form_errors(metric) = form_errors(metric)
.form-group .form-group
= f.label :title, s_('Metrics|Name'), class: 'label-light' = f.label :title, s_('Metrics|Name'), class: 'label-bold'
= f.text_field :title, required: true, class: 'form-control', placeholder: s_('Metrics|e.g. Throughput'), autofocus: true = f.text_field :title, required: true, class: 'form-control', placeholder: s_('Metrics|e.g. Throughput'), autofocus: true
%span.form-text.text-muted %span.form-text.text-muted
= s_('Metrics|Used as a title for the chart') = s_('Metrics|Used as a title for the chart')
...@@ -20,18 +20,18 @@ ...@@ -20,18 +20,18 @@
.form-group.append-bottom-0 .form-group.append-bottom-0
= f.radio_button :group, :business, checked: true = f.radio_button :group, :business, checked: true
= f.label :group_business, s_("Metrics|Business"), class: 'label-light append-right-10' = f.label :group_business, s_("Metrics|Business"), class: 'label-bold append-right-10'
= f.radio_button :group, :response = f.radio_button :group, :response
= f.label :group_response, s_("Metrics|Response"), class: 'label-light append-right-10' = f.label :group_response, s_("Metrics|Response"), class: 'label-bold append-right-10'
= f.radio_button :group, :system = f.radio_button :group, :system
= f.label :group_system, s_("Metrics|System"), class: 'label-light' = f.label :group_system, s_("Metrics|System"), class: 'label-bold'
%p.text-tertiary %p.text-tertiary
= s_('Metrics|For grouping similar metrics') = s_('Metrics|For grouping similar metrics')
.form-group .form-group
= f.label :query, s_('Metrics|Query'), class: 'label-light' = f.label :query, s_('Metrics|Query'), class: 'label-bold'
= f.text_field :query, required: true, class: 'form-control', placeholder: s_('Metrics|e.g. rate(http_requests_total[5m])') = f.text_field :query, required: true, class: 'form-control', placeholder: s_('Metrics|e.g. rate(http_requests_total[5m])')
%span.form-text.text-muted %span.form-text.text-muted
= s_('Metrics|Must be a valid PromQL query.') = s_('Metrics|Must be a valid PromQL query.')
...@@ -39,15 +39,15 @@ ...@@ -39,15 +39,15 @@
= sprite_icon("external-link", size: 12) = sprite_icon("external-link", size: 12)
= s_('Metrics|Prometheus Query Documentation') = s_('Metrics|Prometheus Query Documentation')
.form-group .form-group
= f.label :y_label, s_('Metrics|Y-axis label'), class: 'label-light' = f.label :y_label, s_('Metrics|Y-axis label'), class: 'label-bold'
= f.text_field :y_label, class: 'form-control', placeholder: s_('Metrics|e.g. Requests/second') = f.text_field :y_label, class: 'form-control', placeholder: s_('Metrics|e.g. Requests/second')
%span.form-text.text-muted %span.form-text.text-muted
= s_("Metrics|Label of the chart's vertical axis. Usually the type of the unit being charted. The horizontal axis (X-axis) always represents time.") = s_("Metrics|Label of the chart's vertical axis. Usually the type of the unit being charted. The horizontal axis (X-axis) always represents time.")
.form-group .form-group
= f.label :unit, s_('Metrics|Unit label'), class: 'label-light' = f.label :unit, s_('Metrics|Unit label'), class: 'label-bold'
= f.text_field :unit, class: 'form-control', placeholder: s_('Metrics|e.g. req/sec') = f.text_field :unit, class: 'form-control', placeholder: s_('Metrics|e.g. req/sec')
.form-group .form-group
= f.label :legend, s_('Metrics|Legend label (optional)'), class: 'label-light' = f.label :legend, s_('Metrics|Legend label (optional)'), class: 'label-bold'
= f.text_field :legend, class: 'form-control', placeholder: s_('Metrics|e.g. HTTP requests') = f.text_field :legend, class: 'form-control', placeholder: s_('Metrics|e.g. HTTP requests')
%span.form-text.text-muted %span.form-text.text-muted
= s_('Metrics|Used if the query returns a single series. If it returns multiple series, their legend labels will be picked up from the response.') = s_('Metrics|Used if the query returns a single series. If it returns multiple series, their legend labels will be picked up from the response.')
......
ee/app/views/shared/_mirror_trigger_builds_setting.html.haml
View file @ db704770
.form-group .form-group
= f.check_box :mirror_trigger_builds, class: "float-left" = f.check_box :mirror_trigger_builds, class: "float-left"
.prepend-left-20 .prepend-left-20
= f.label :mirror_trigger_builds, "Trigger pipelines for mirror updates", class: "label-light" = f.label :mirror_trigger_builds, "Trigger pipelines for mirror updates", class: "label-bold"
%p.light.append-bottom-0 %p.light.append-bottom-0
Trigger pipelines when branches or tags are updated from the upstream repository. Trigger pipelines when branches or tags are updated from the upstream repository.
Depending on the activity of the upstream repository, this may greatly increase the load on your CI runners. Depending on the activity of the upstream repository, this may greatly increase the load on your CI runners.
......
ee/app/views/shared/_repository_size_limit_setting.html.haml
View file @ db704770
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- form = local_assigns.fetch(:form) - form = local_assigns.fetch(:form)
- type = local_assigns.fetch(:type) - type = local_assigns.fetch(:type)
- label_class = (type == :project) ? 'label-light' : 'col-form-label col-sm-2' - label_class = (type == :project) ? 'label-bold' : 'col-form-label col-sm-2'
.form-group.row .form-group.row
= form.label :repository_size_limit, class: label_class do = form.label :repository_size_limit, class: label_class do
......
ee/app/views/shared/ee/_import_form.html.haml
View file @ db704770
- if License.feature_available?(:repository_mirrors) - if License.feature_available?(:repository_mirrors)
.form-group .form-group
= f.label :mirror, class: 'label-light' do = f.label :mirror, class: 'label-bold' do
= f.check_box :mirror, disabled: true = f.check_box :mirror, disabled: true
%strong %strong
Mirror repository Mirror repository
......
ee/app/views/shared/issuable/_approvals.html.haml
View file @ db704770
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
.col-sm-12 .col-sm-12
.form-group.row .form-group.row
= form.label :approvals_before_merge, class: 'label-light' do = form.label :approvals_before_merge, class: 'label-bold' do
Approvals required Approvals required
= form.number_field :approvals_before_merge, class: 'form-control', value: issuable.approvals_required, readonly: !can_update_approvers = form.number_field :approvals_before_merge, class: 'form-control', value: issuable.approvals_required, readonly: !can_update_approvers
......
ee/app/views/shared/push_rules/_commit_committer_check_setting.html.haml
View file @ db704770
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.form-check .form-check
= form.check_box :commit_committer_check, class: "form-check-input", disabled: !can_change_push_rule?(form.object, :commit_committer_check) = form.check_box :commit_committer_check, class: "form-check-input", disabled: !can_change_push_rule?(form.object, :commit_committer_check)
= form.label :commit_committer_check, class: "label-light form-check-label" do = form.label :commit_committer_check, class: "label-bold form-check-label" do
= s_("PushRule|Committer restriction") = s_("PushRule|Committer restriction")
%p.text-muted %p.text-muted
= commit_committer_check_description(push_rule) = commit_committer_check_description(push_rule)
ee/app/views/shared/push_rules/_form.html.haml
View file @ db704770
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.form-check .form-check
= f.check_box :deny_delete_tag, class: "form-check-input" = f.check_box :deny_delete_tag, class: "form-check-input"
= f.label :deny_delete_tag, class: "label-light form-check-label" do = f.label :deny_delete_tag, class: "label-bold form-check-label" do
Do not allow users to remove git tags with Do not allow users to remove git tags with
%code git push %code git push
%p.text-muted %p.text-muted
...@@ -12,20 +12,20 @@ ...@@ -12,20 +12,20 @@
.form-check .form-check
= f.check_box :member_check, class: "form-check-input" = f.check_box :member_check, class: "form-check-input"
= f.label :member_check, "Check whether author is a GitLab user", class: "label-light form-check-label" = f.label :member_check, "Check whether author is a GitLab user", class: "label-bold form-check-label"
%p.text-muted %p.text-muted
Restrict commits by author (email) to existing GitLab users Restrict commits by author (email) to existing GitLab users
.form-check .form-check
= f.check_box :prevent_secrets, class: "form-check-input" = f.check_box :prevent_secrets, class: "form-check-input"
= f.label :prevent_secrets, "Prevent committing secrets to Git", class: "label-light form-check-label" = f.label :prevent_secrets, "Prevent committing secrets to Git", class: "label-bold form-check-label"
%p.text-muted %p.text-muted
GitLab will reject any files that are likely to contain secrets. GitLab will reject any files that are likely to contain secrets.
The list of file names we reject is available in the #{link_to "documentation", help_page_path('push_rules/push_rules')}. The list of file names we reject is available in the #{link_to "documentation", help_page_path('push_rules/push_rules')}.
.form-group .form-group
= f.label :commit_message_regex, "Commit message", class: "label-light" = f.label :commit_message_regex, "Commit message", class: "label-bold"
= f.text_field :commit_message_regex, class: "form-control", placeholder: 'Example: Fixes \d+\..*' = f.text_field :commit_message_regex, class: "form-control", placeholder: 'Example: Fixes \d+\..*'
.form-text.text-muted .form-text.text-muted
All commit messages must match this All commit messages must match this
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
For example you can require that an issue number is always mentioned in the commit message. For example you can require that an issue number is always mentioned in the commit message.
.form-group .form-group
= f.label :commit_message_negative_regex, "Commit message negative match", class: 'label-light' = f.label :commit_message_negative_regex, "Commit message negative match", class: 'label-bold'
= f.text_field :commit_message_negative_regex, class: "form-control", placeholder: 'Example: ssh\:\/\/' = f.text_field :commit_message_negative_regex, class: "form-control", placeholder: 'Example: ssh\:\/\/'
.form-text.text-muted .form-text.text-muted
No commit message is allowed to match this No commit message is allowed to match this
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
For example you can require that no commit message contains any links. For example you can require that no commit message contains any links.
.form-group .form-group
= f.label :branch_name_regex, "Branch name", class: "label-light" = f.label :branch_name_regex, "Branch name", class: "label-bold"
= f.text_field :branch_name_regex, class: "form-control", placeholder: 'Example: (feature|hotfix)\/*' = f.text_field :branch_name_regex, class: "form-control", placeholder: 'Example: (feature|hotfix)\/*'
.form-text.text-muted .form-text.text-muted
All branch names must match this All branch names must match this
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
If this field is empty it allows any branch name. If this field is empty it allows any branch name.
.form-group .form-group
= f.label :author_email_regex, "Commit author's email", class: "label-light" = f.label :author_email_regex, "Commit author's email", class: "label-bold"
= f.text_field :author_email_regex, class: "form-control", placeholder: 'Example: @my-company.com$' = f.text_field :author_email_regex, class: "form-control", placeholder: 'Example: @my-company.com$'
.form-text.text-muted .form-text.text-muted
All commit author's email must match this All commit author's email must match this
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
If this field is empty it allows any email. If this field is empty it allows any email.
.form-group .form-group
= f.label :file_name_regex, "Prohibited file names", class: "label-light" = f.label :file_name_regex, "Prohibited file names", class: "label-bold"
= f.text_field :file_name_regex, class: "form-control", placeholder: 'Example: (jar|exe)$' = f.text_field :file_name_regex, class: "form-control", placeholder: 'Example: (jar|exe)$'
.form-text.text-muted .form-text.text-muted
All commited filenames must not match this All commited filenames must not match this
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
If this field is empty it allows any filenames. If this field is empty it allows any filenames.
.form-group .form-group
= f.label :max_file_size, "Maximum file size (MB)", class: "label-light" = f.label :max_file_size, "Maximum file size (MB)", class: "label-bold"
= f.number_field :max_file_size, class: "form-control", min: 0 = f.number_field :max_file_size, class: "form-control", min: 0
.form-text.text-muted .form-text.text-muted
Pushes that contain added or updated files that exceed this file size are rejected. Pushes that contain added or updated files that exceed this file size are rejected.
......
ee/app/views/shared/push_rules/_reject_unsigned_commits_setting.html.haml
View file @ db704770
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.form-check .form-check
= form.check_box :reject_unsigned_commits, class: "form-check-input", disabled: !can_change_push_rule?(form.object, :reject_unsigned_commits) = form.check_box :reject_unsigned_commits, class: "form-check-input", disabled: !can_change_push_rule?(form.object, :reject_unsigned_commits)
= form.label :reject_unsigned_commits, class: "label-light form-check-label" do = form.label :reject_unsigned_commits, class: "label-bold form-check-label" do
Reject unsigned commits Reject unsigned commits
%p.text-muted %p.text-muted
= reject_unsigned_commits_description(push_rule) = reject_unsigned_commits_description(push_rule)
spec/javascripts/ide/components/new_dropdown/modal_spec.js
View file @ db704770
...@@ -38,7 +38,7 @@ describe('new file modal component', () => { ...@@ -38,7 +38,7 @@ describe('new file modal component', () => {
}); });
it(`sets form label as ${type}`, () => { it(`sets form label as ${type}`, () => {
expect(vm.$el.querySelector('.label-light').textContent.trim()).toBe('Name'); expect(vm.$el.querySelector('.label-bold').textContent.trim()).toBe('Name');
}); });
describe('createEntryInStore', () => { describe('createEntryInStore', () => {
......
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