diff options
Diffstat (limited to 'app')
71 files changed, 203 insertions, 203 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js index 3c781ccddc8..843321019ee 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js @@ -323,7 +323,7 @@ export default { class="prepend-top-default commit-message-editor"> <div class="form-group clearfix"> <label - class="control-label" + class="col-form-label" for="commit-message"> Commit message </label> diff --git a/app/views/abuse_reports/new.html.haml b/app/views/abuse_reports/new.html.haml index d8cfe6e53db..9734001500f 100644 --- a/app/views/abuse_reports/new.html.haml +++ b/app/views/abuse_reports/new.html.haml @@ -7,12 +7,12 @@ = f.hidden_field :user_id .form-group - = f.label :user_id, class: 'control-label' + = f.label :user_id, class: 'col-form-label' .col-sm-10 - name = "#{@abuse_report.user.name} (@#{@abuse_report.user.username})" = text_field_tag :user_name, name, class: "form-control", readonly: true .form-group - = f.label :message, class: 'control-label' + = f.label :message, class: 'col-form-label' .col-sm-10 = f.text_area :message, class: "form-control", rows: 2, required: true, value: sanitize(@ref_url) .form-text.text-muted diff --git a/app/views/admin/appearances/_form.html.haml b/app/views/admin/appearances/_form.html.haml index 142bd9913ae..ec86ce5c114 100644 --- a/app/views/admin/appearances/_form.html.haml +++ b/app/views/admin/appearances/_form.html.haml @@ -5,7 +5,7 @@ %legend Navigation bar: .form-group - = f.label :header_logo, 'Header logo', class: 'control-label' + = f.label :header_logo, 'Header logo', class: 'col-form-label' .col-sm-10 - if @appearance.header_logo? = image_tag @appearance.header_logo_url, class: 'appearance-light-logo-preview' @@ -22,17 +22,17 @@ %legend Sign in/Sign up pages: .form-group - = f.label :title, class: 'control-label' + = f.label :title, class: 'col-form-label' .col-sm-10 = f.text_field :title, class: "form-control" .form-group - = f.label :description, class: 'control-label' + = f.label :description, class: 'col-form-label' .col-sm-10 = f.text_area :description, class: "form-control", rows: 10 .hint Description parsed with #{link_to "GitLab Flavored Markdown", help_page_path('user/markdown'), target: '_blank'}. .form-group - = f.label :logo, class: 'control-label' + = f.label :logo, class: 'col-form-label' .col-sm-10 - if @appearance.logo? = image_tag @appearance.logo_url, class: 'appearance-logo-preview' @@ -49,7 +49,7 @@ %legend New project pages: .form-group - = f.label :new_project_guidelines, class: 'control-label' + = f.label :new_project_guidelines, class: 'col-form-label' .col-sm-10 = f.text_area :new_project_guidelines, class: "form-control", rows: 10 .hint diff --git a/app/views/admin/application_settings/_abuse.html.haml b/app/views/admin/application_settings/_abuse.html.haml index 1469a1d7857..39dcc28a397 100644 --- a/app/views/admin/application_settings/_abuse.html.haml +++ b/app/views/admin/application_settings/_abuse.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group - = f.label :admin_notification_email, 'Abuse reports notification email', class: 'control-label col-sm-2' + = f.label :admin_notification_email, 'Abuse reports notification email', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :admin_notification_email, class: 'form-control' .form-text.text-muted diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml index 955a871647c..bbfae062624 100644 --- a/app/views/admin/application_settings/_account_and_limit.html.haml +++ b/app/views/admin/application_settings/_account_and_limit.html.haml @@ -9,27 +9,27 @@ = f.check_box :gravatar_enabled Gravatar enabled .form-group - = f.label :default_projects_limit, class: 'control-label col-sm-2' + = f.label :default_projects_limit, class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :default_projects_limit, class: 'form-control' .form-group - = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'control-label col-sm-2' + = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :max_attachment_size, class: 'form-control' .form-group - = f.label :session_expire_delay, 'Session duration (minutes)', class: 'control-label col-sm-2' + = f.label :session_expire_delay, 'Session duration (minutes)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :session_expire_delay, class: 'form-control' %span.form-text.text-muted#session_expire_delay_help_block GitLab restart is required to apply changes .form-group - = f.label :user_oauth_applications, 'User OAuth applications', class: 'control-label col-sm-2' + = f.label :user_oauth_applications, 'User OAuth applications', class: 'col-form-label col-sm-2' .col-sm-10 .form-check = f.label :user_oauth_applications do = f.check_box :user_oauth_applications Allow users to register any application to use GitLab as an OAuth provider .form-group - = f.label :user_default_external, 'New users set to external', class: 'control-label col-sm-2' + = f.label :user_default_external, 'New users set to external', class: 'col-form-label col-sm-2' .col-sm-10 .form-check = f.label :user_default_external do diff --git a/app/views/admin/application_settings/_background_jobs.html.haml b/app/views/admin/application_settings/_background_jobs.html.haml index 30bcf029481..835b8c80763 100644 --- a/app/views/admin/application_settings/_background_jobs.html.haml +++ b/app/views/admin/application_settings/_background_jobs.html.haml @@ -15,13 +15,13 @@ .form-text.text-muted Limit the amount of resources slow running jobs are assigned. .form-group - = f.label :sidekiq_throttling_queues, 'Sidekiq queues to throttle', class: 'control-label col-sm-2' + = f.label :sidekiq_throttling_queues, 'Sidekiq queues to throttle', class: 'col-form-label col-sm-2' .col-sm-10 = f.select :sidekiq_throttling_queues, sidekiq_queue_options_for_select, { include_hidden: false }, multiple: true, class: 'select2 select-wide', data: { field: 'sidekiq_throttling_queues' } .form-text.text-muted Choose which queues you wish to throttle. .form-group - = f.label :sidekiq_throttling_factor, 'Throttling Factor', class: 'control-label col-sm-2' + = f.label :sidekiq_throttling_factor, 'Throttling Factor', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :sidekiq_throttling_factor, class: 'form-control', min: '0.01', max: '0.99', step: '0.01' .form-text.text-muted diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index 23a37caf391..37ed551757c 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -12,7 +12,7 @@ It will automatically build, test, and deploy applications based on a predefined CI/CD configuration = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md') .form-group - = f.label :auto_devops_domain, class: 'control-label col-sm-2' + = f.label :auto_devops_domain, class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :auto_devops_domain, class: 'form-control', placeholder: 'domain.com' .form-text.text-muted @@ -24,19 +24,19 @@ = f.check_box :shared_runners_enabled Enable shared runners for new projects .form-group - = f.label :shared_runners_text, class: 'control-label col-sm-2' + = f.label :shared_runners_text, class: 'col-form-label col-sm-2' .col-sm-10 = f.text_area :shared_runners_text, class: 'form-control', rows: 4 .form-text.text-muted Markdown enabled .form-group - = f.label :max_artifacts_size, 'Maximum artifacts size (MB)', class: 'control-label col-sm-2' + = f.label :max_artifacts_size, 'Maximum artifacts size (MB)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :max_artifacts_size, class: 'form-control' .form-text.text-muted Set the maximum file size for each job's artifacts = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'maximum-artifacts-size') .form-group - = f.label :default_artifacts_expire_in, 'Default artifacts expiration', class: 'control-label col-sm-2' + = f.label :default_artifacts_expire_in, 'Default artifacts expiration', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :default_artifacts_expire_in, class: 'form-control' .form-text.text-muted diff --git a/app/views/admin/application_settings/_gitaly.html.haml b/app/views/admin/application_settings/_gitaly.html.haml index 80a9baa62a6..3a168cc879d 100644 --- a/app/views/admin/application_settings/_gitaly.html.haml +++ b/app/views/admin/application_settings/_gitaly.html.haml @@ -3,14 +3,14 @@ %fieldset .form-group - = f.label :gitaly_timeout_default, 'Default Timeout Period', class: 'control-label col-sm-2' + = f.label :gitaly_timeout_default, 'Default Timeout Period', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :gitaly_timeout_default, class: 'form-control' .form-text.text-muted Timeout for Gitaly calls from the GitLab application (in seconds). This timeout is not enforced for git fetch/push operations or Sidekiq jobs. .form-group - = f.label :gitaly_timeout_fast, 'Fast Timeout Period', class: 'control-label col-sm-2' + = f.label :gitaly_timeout_fast, 'Fast Timeout Period', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :gitaly_timeout_fast, class: 'form-control' .form-text.text-muted @@ -18,7 +18,7 @@ If they exceed this threshold, there may be a problem with a storage shard and 'failing fast' can help maintain the stability of the GitLab instance. .form-group - = f.label :gitaly_timeout_medium, 'Medium Timeout Period', class: 'control-label col-sm-2' + = f.label :gitaly_timeout_medium, 'Medium Timeout Period', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :gitaly_timeout_medium, class: 'form-control' .form-text.text-muted diff --git a/app/views/admin/application_settings/_help_page.html.haml b/app/views/admin/application_settings/_help_page.html.haml index 26ba7f123e7..fae4ef8286b 100644 --- a/app/views/admin/application_settings/_help_page.html.haml +++ b/app/views/admin/application_settings/_help_page.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group - = f.label :help_page_text, class: 'control-label col-sm-2' + = f.label :help_page_text, class: 'col-form-label col-sm-2' .col-sm-10 = f.text_area :help_page_text, class: 'form-control', rows: 4 .form-text.text-muted Markdown enabled @@ -14,7 +14,7 @@ = f.check_box :help_page_hide_commercial_content Hide marketing-related entries from help .form-group - = f.label :help_page_support_url, 'Support page URL', class: 'control-label col-sm-2' + = f.label :help_page_support_url, 'Support page URL', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :help_page_support_url, class: 'form-control', placeholder: 'http://company.example.com/getting-help', :'aria-describedby' => 'support_help_block' %span.form-text.text-muted#support_help_block Alternate support URL for help page diff --git a/app/views/admin/application_settings/_influx.html.haml b/app/views/admin/application_settings/_influx.html.haml index f6b7d452eb8..51c9b3d534b 100644 --- a/app/views/admin/application_settings/_influx.html.haml +++ b/app/views/admin/application_settings/_influx.html.haml @@ -15,11 +15,11 @@ = f.check_box :metrics_enabled Enable InfluxDB Metrics .form-group - = f.label :metrics_host, 'InfluxDB host', class: 'control-label col-sm-2' + = f.label :metrics_host, 'InfluxDB host', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :metrics_host, class: 'form-control', placeholder: 'influxdb.example.com' .form-group - = f.label :metrics_port, 'InfluxDB port', class: 'control-label col-sm-2' + = f.label :metrics_port, 'InfluxDB port', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :metrics_port, class: 'form-control', placeholder: '8089' .form-text.text-muted @@ -28,7 +28,7 @@ sending messages to this port, without it metrics data will not be saved. .form-group - = f.label :metrics_pool_size, 'Connection pool size', class: 'control-label col-sm-2' + = f.label :metrics_pool_size, 'Connection pool size', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :metrics_pool_size, class: 'form-control' .form-text.text-muted @@ -37,28 +37,28 @@ enough connections are available (at minimum the amount of application server threads). .form-group - = f.label :metrics_timeout, 'Connection timeout', class: 'control-label col-sm-2' + = f.label :metrics_timeout, 'Connection timeout', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :metrics_timeout, class: 'form-control' .form-text.text-muted The amount of seconds after which an InfluxDB connection will time out. .form-group - = f.label :metrics_method_call_threshold, 'Method Call Threshold (ms)', class: 'control-label col-sm-2' + = f.label :metrics_method_call_threshold, 'Method Call Threshold (ms)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :metrics_method_call_threshold, class: 'form-control' .form-text.text-muted A method call is only tracked when it takes longer to complete than the given amount of milliseconds. .form-group - = f.label :metrics_sample_interval, 'Sampler Interval (sec)', class: 'control-label col-sm-2' + = f.label :metrics_sample_interval, 'Sampler Interval (sec)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :metrics_sample_interval, class: 'form-control' .form-text.text-muted The sampling interval in seconds. Sampled data includes memory usage, retained Ruby objects, file descriptors and so on. .form-group - = f.label :metrics_packet_size, 'Metrics per packet', class: 'control-label col-sm-2' + = f.label :metrics_packet_size, 'Metrics per packet', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :metrics_packet_size, class: 'form-control' .form-text.text-muted diff --git a/app/views/admin/application_settings/_ip_limits.html.haml b/app/views/admin/application_settings/_ip_limits.html.haml index 518a13a561a..5f7fdd08225 100644 --- a/app/views/admin/application_settings/_ip_limits.html.haml +++ b/app/views/admin/application_settings/_ip_limits.html.haml @@ -11,11 +11,11 @@ %span.form-text.text-muted Helps reduce request volume (e.g. from crawlers or abusive bots) .form-group - = f.label :throttle_unauthenticated_requests_per_period, 'Max requests per period per IP', class: 'control-label col-sm-2' + = f.label :throttle_unauthenticated_requests_per_period, 'Max requests per period per IP', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :throttle_unauthenticated_requests_per_period, class: 'form-control' .form-group - = f.label :throttle_unauthenticated_period_in_seconds, 'Rate limit period in seconds', class: 'control-label col-sm-2' + = f.label :throttle_unauthenticated_period_in_seconds, 'Rate limit period in seconds', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :throttle_unauthenticated_period_in_seconds, class: 'form-control' .form-group @@ -27,11 +27,11 @@ %span.form-text.text-muted Helps reduce request volume (e.g. from crawlers or abusive bots) .form-group - = f.label :throttle_authenticated_api_requests_per_period, 'Max requests per period per user', class: 'control-label col-sm-2' + = f.label :throttle_authenticated_api_requests_per_period, 'Max requests per period per user', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :throttle_authenticated_api_requests_per_period, class: 'form-control' .form-group - = f.label :throttle_authenticated_api_period_in_seconds, 'Rate limit period in seconds', class: 'control-label col-sm-2' + = f.label :throttle_authenticated_api_period_in_seconds, 'Rate limit period in seconds', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :throttle_authenticated_api_period_in_seconds, class: 'form-control' .form-group @@ -43,11 +43,11 @@ %span.form-text.text-muted Helps reduce request volume (e.g. from crawlers or abusive bots) .form-group - = f.label :throttle_authenticated_web_requests_per_period, 'Max requests per period per user', class: 'control-label col-sm-2' + = f.label :throttle_authenticated_web_requests_per_period, 'Max requests per period per user', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :throttle_authenticated_web_requests_per_period, class: 'form-control' .form-group - = f.label :throttle_authenticated_web_period_in_seconds, 'Rate limit period in seconds', class: 'control-label col-sm-2' + = f.label :throttle_authenticated_web_period_in_seconds, 'Rate limit period in seconds', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :throttle_authenticated_web_period_in_seconds, class: 'form-control' diff --git a/app/views/admin/application_settings/_koding.html.haml b/app/views/admin/application_settings/_koding.html.haml index 433ea35ec17..d084286d6c8 100644 --- a/app/views/admin/application_settings/_koding.html.haml +++ b/app/views/admin/application_settings/_koding.html.haml @@ -11,7 +11,7 @@ .form-text.text-muted Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again. .form-group - = f.label :koding_url, 'Koding URL', class: 'control-label col-sm-2' + = f.label :koding_url, 'Koding URL', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090' .form-text.text-muted diff --git a/app/views/admin/application_settings/_logging.html.haml b/app/views/admin/application_settings/_logging.html.haml index 34c8bfdeea7..062787c6afd 100644 --- a/app/views/admin/application_settings/_logging.html.haml +++ b/app/views/admin/application_settings/_logging.html.haml @@ -14,7 +14,7 @@ %a{ href: 'https://getsentry.com', target: '_blank', rel: 'noopener noreferrer' } https://getsentry.com .form-group - = f.label :sentry_dsn, 'Sentry DSN', class: 'control-label col-sm-2' + = f.label :sentry_dsn, 'Sentry DSN', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :sentry_dsn, class: 'form-control' @@ -29,7 +29,7 @@ %a{ href: 'https://sentry.io/for/javascript/', target: '_blank', rel: 'noopener noreferrer' } https://sentry.io/for/javascript/ .form-group - = f.label :clientside_sentry_dsn, 'Clientside Sentry DSN', class: 'control-label col-sm-2' + = f.label :clientside_sentry_dsn, 'Clientside Sentry DSN', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :clientside_sentry_dsn, class: 'form-control' diff --git a/app/views/admin/application_settings/_pages.html.haml b/app/views/admin/application_settings/_pages.html.haml index df6bca45b01..9f5044d4d1c 100644 --- a/app/views/admin/application_settings/_pages.html.haml +++ b/app/views/admin/application_settings/_pages.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group - = f.label :max_pages_size, 'Maximum size of pages (MB)', class: 'control-label col-sm-2' + = f.label :max_pages_size, 'Maximum size of pages (MB)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :max_pages_size, class: 'form-control' .form-text.text-muted 0 for unlimited diff --git a/app/views/admin/application_settings/_performance_bar.html.haml b/app/views/admin/application_settings/_performance_bar.html.haml index 41f98ce9886..c5551515172 100644 --- a/app/views/admin/application_settings/_performance_bar.html.haml +++ b/app/views/admin/application_settings/_performance_bar.html.haml @@ -9,7 +9,7 @@ = f.check_box :performance_bar_enabled Enable the Performance Bar .form-group - = f.label :performance_bar_allowed_group_id, 'Allowed group', class: 'control-label col-sm-2' + = f.label :performance_bar_allowed_group_id, 'Allowed group', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :performance_bar_allowed_group_id, class: 'form-control', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path diff --git a/app/views/admin/application_settings/_plantuml.html.haml b/app/views/admin/application_settings/_plantuml.html.haml index 1de8d8e5201..7eb46c68842 100644 --- a/app/views/admin/application_settings/_plantuml.html.haml +++ b/app/views/admin/application_settings/_plantuml.html.haml @@ -9,7 +9,7 @@ = f.check_box :plantuml_enabled Enable PlantUML .form-group - = f.label :plantuml_url, 'PlantUML URL', class: 'control-label col-sm-2' + = f.label :plantuml_url, 'PlantUML URL', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :plantuml_url, class: 'form-control', placeholder: 'http://gitlab.your-plantuml-instance.com:8080' .form-text.text-muted diff --git a/app/views/admin/application_settings/_realtime.html.haml b/app/views/admin/application_settings/_realtime.html.haml index cdfe2225b9f..414b84c78fb 100644 --- a/app/views/admin/application_settings/_realtime.html.haml +++ b/app/views/admin/application_settings/_realtime.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group - = f.label :polling_interval_multiplier, 'Polling interval multiplier', class: 'control-label col-sm-2' + = f.label :polling_interval_multiplier, 'Polling interval multiplier', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :polling_interval_multiplier, class: 'form-control' .form-text.text-muted diff --git a/app/views/admin/application_settings/_registry.html.haml b/app/views/admin/application_settings/_registry.html.haml index 3451ef62458..025ae0df12e 100644 --- a/app/views/admin/application_settings/_registry.html.haml +++ b/app/views/admin/application_settings/_registry.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group - = f.label :container_registry_token_expire_delay, 'Authorization token duration (minutes)', class: 'control-label col-sm-2' + = f.label :container_registry_token_expire_delay, 'Authorization token duration (minutes)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :container_registry_token_expire_delay, class: 'form-control' diff --git a/app/views/admin/application_settings/_repository_check.html.haml b/app/views/admin/application_settings/_repository_check.html.haml index f33bfd34199..1ddf316f4cb 100644 --- a/app/views/admin/application_settings/_repository_check.html.haml +++ b/app/views/admin/application_settings/_repository_check.html.haml @@ -41,19 +41,19 @@ Creating pack file bitmaps makes housekeeping take a little longer but bitmaps should accelerate 'git clone' performance. .form-group - = f.label :housekeeping_incremental_repack_period, 'Incremental repack period', class: 'control-label col-sm-2' + = f.label :housekeeping_incremental_repack_period, 'Incremental repack period', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :housekeeping_incremental_repack_period, class: 'form-control' .form-text.text-muted Number of Git pushes after which an incremental 'git repack' is run. .form-group - = f.label :housekeeping_full_repack_period, 'Full repack period', class: 'control-label col-sm-2' + = f.label :housekeeping_full_repack_period, 'Full repack period', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :housekeeping_full_repack_period, class: 'form-control' .form-text.text-muted Number of Git pushes after which a full 'git repack' is run. .form-group - = f.label :housekeeping_gc_period, 'Git GC period', class: 'control-label col-sm-2' + = f.label :housekeeping_gc_period, 'Git GC period', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :housekeeping_gc_period, class: 'form-control' .form-text.text-muted diff --git a/app/views/admin/application_settings/_repository_storage.html.haml b/app/views/admin/application_settings/_repository_storage.html.haml index b310abd336f..03bdb86fac2 100644 --- a/app/views/admin/application_settings/_repository_storage.html.haml +++ b/app/views/admin/application_settings/_repository_storage.html.haml @@ -14,7 +14,7 @@ repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance. %em (EXPERIMENTAL) .form-group - = f.label :repository_storages, 'Storage paths for new projects', class: 'control-label col-sm-2' + = f.label :repository_storages, 'Storage paths for new projects', class: 'col-form-label col-sm-2' .col-sm-10 = f.select :repository_storages, repository_storages_options_for_select(@application_setting.repository_storages), {include_hidden: false}, multiple: true, class: 'form-control' @@ -25,31 +25,31 @@ .sub-section %h4 Circuit breaker .form-group - = f.label :circuitbreaker_check_interval, _('Check interval'), class: 'control-label col-sm-2' + = f.label :circuitbreaker_check_interval, _('Check interval'), class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :circuitbreaker_check_interval, class: 'form-control' .form-text.text-muted = circuitbreaker_check_interval_help_text .form-group - = f.label :circuitbreaker_access_retries, _('Number of access attempts'), class: 'control-label col-sm-2' + = f.label :circuitbreaker_access_retries, _('Number of access attempts'), class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :circuitbreaker_access_retries, class: 'form-control' .form-text.text-muted = circuitbreaker_access_retries_help_text .form-group - = f.label :circuitbreaker_storage_timeout, _('Seconds to wait for a storage access attempt'), class: 'control-label col-sm-2' + = f.label :circuitbreaker_storage_timeout, _('Seconds to wait for a storage access attempt'), class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :circuitbreaker_storage_timeout, class: 'form-control' .form-text.text-muted = circuitbreaker_storage_timeout_help_text .form-group - = f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'control-label col-sm-2' + = f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :circuitbreaker_failure_count_threshold, class: 'form-control' .form-text.text-muted = circuitbreaker_failure_count_help_text .form-group - = f.label :circuitbreaker_failure_reset_time, _('Seconds before reseting failure information'), class: 'control-label col-sm-2' + = f.label :circuitbreaker_failure_reset_time, _('Seconds before reseting failure information'), class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :circuitbreaker_failure_reset_time, class: 'form-control' .form-text.text-muted diff --git a/app/views/admin/application_settings/_signin.html.haml b/app/views/admin/application_settings/_signin.html.haml index 8ee0be925bd..bb7adf49b31 100644 --- a/app/views/admin/application_settings/_signin.html.haml +++ b/app/views/admin/application_settings/_signin.html.haml @@ -23,35 +23,35 @@ must be used to authenticate. - if omniauth_enabled? && button_based_providers.any? .form-group - = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'control-label col-sm-2' + = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'col-form-label col-sm-2' .col-sm-10 .btn-group{ data: { toggle: 'buttons' } } - oauth_providers_checkboxes.each do |source| = source .form-group - = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2' + = f.label :two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2' .col-sm-10 .form-check = f.label :require_two_factor_authentication do = f.check_box :require_two_factor_authentication Require all users to setup Two-factor authentication .form-group - = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'control-label col-sm-2' + = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :two_factor_grace_period, min: 0, class: 'form-control', placeholder: '0' .form-text.text-muted Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication .form-group - = f.label :home_page_url, 'Home page URL', class: 'control-label col-sm-2' + = f.label :home_page_url, 'Home page URL', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block' %span.form-text.text-muted#home_help_block We will redirect non-logged in users to this page .form-group - = f.label :after_sign_out_path, class: 'control-label col-sm-2' + = f.label :after_sign_out_path, class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :after_sign_out_path, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'after_sign_out_path_help_block' %span.form-text.text-muted#after_sign_out_path_help_block We will redirect users to this page after they sign out .form-group - = f.label :sign_in_text, class: 'control-label col-sm-2' + = f.label :sign_in_text, class: 'col-form-label col-sm-2' .col-sm-10 = f.text_area :sign_in_text, class: 'form-control', rows: 4 .form-text.text-muted Markdown enabled diff --git a/app/views/admin/application_settings/_signup.html.haml b/app/views/admin/application_settings/_signup.html.haml index 3b24188b9c3..c83d3e5ed09 100644 --- a/app/views/admin/application_settings/_signup.html.haml +++ b/app/views/admin/application_settings/_signup.html.haml @@ -15,12 +15,12 @@ = f.check_box :send_user_confirmation_email Send confirmation email on sign-up .form-group - = f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'control-label col-sm-2' + = f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_area :domain_whitelist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8 .form-text.text-muted ONLY users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com .form-group - = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'control-label col-sm-2' + = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'col-form-label col-sm-2' .col-sm-10 .form-check = f.label :domain_blacklist_enabled do @@ -39,18 +39,18 @@ .option-title Enter blacklist manually .form-group.blacklist-file - = f.label :domain_blacklist_file, 'Blacklist file', class: 'control-label col-sm-2' + = f.label :domain_blacklist_file, 'Blacklist file', class: 'col-form-label col-sm-2' .col-sm-10 = f.file_field :domain_blacklist_file, class: 'form-control', accept: '.txt,.conf' .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines or commas for multiple entries. .form-group.blacklist-raw - = f.label :domain_blacklist, 'Blacklisted domains for sign-ups', class: 'control-label col-sm-2' + = f.label :domain_blacklist, 'Blacklisted domains for sign-ups', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_area :domain_blacklist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8 .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com .form-group - = f.label :after_sign_up_text, class: 'control-label col-sm-2' + = f.label :after_sign_up_text, class: 'col-form-label col-sm-2' .col-sm-10 = f.text_area :after_sign_up_text, class: 'form-control', rows: 4 .form-text.text-muted Markdown enabled diff --git a/app/views/admin/application_settings/_spam.html.haml b/app/views/admin/application_settings/_spam.html.haml index b086447c99a..50197211ac7 100644 --- a/app/views/admin/application_settings/_spam.html.haml +++ b/app/views/admin/application_settings/_spam.html.haml @@ -11,7 +11,7 @@ %span.form-text.text-muted#recaptcha_help_block Helps prevent bots from creating accounts .form-group - = f.label :recaptcha_site_key, 'reCAPTCHA Site Key', class: 'control-label col-sm-2' + = f.label :recaptcha_site_key, 'reCAPTCHA Site Key', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :recaptcha_site_key, class: 'form-control' .form-text.text-muted @@ -19,7 +19,7 @@ %a{ href: 'http://www.google.com/recaptcha', target: 'blank' } http://www.google.com/recaptcha .form-group - = f.label :recaptcha_private_key, 'reCAPTCHA Private Key', class: 'control-label col-sm-2' + = f.label :recaptcha_private_key, 'reCAPTCHA Private Key', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :recaptcha_private_key, class: 'form-control' @@ -32,7 +32,7 @@ %span.form-text.text-muted#akismet_help_block Helps prevent bots from creating issues .form-group - = f.label :akismet_api_key, 'Akismet API Key', class: 'control-label col-sm-2' + = f.label :akismet_api_key, 'Akismet API Key', class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :akismet_api_key, class: 'form-control' .form-text.text-muted @@ -49,14 +49,14 @@ Helps prevent malicious users hide their activity .form-group - = f.label :unique_ips_limit_per_user, 'IPs per user', class: 'control-label col-sm-2' + = f.label :unique_ips_limit_per_user, 'IPs per user', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :unique_ips_limit_per_user, class: 'form-control' .form-text.text-muted Maximum number of unique IPs per user .form-group - = f.label :unique_ips_limit_time_window, 'IP expiration time', class: 'control-label col-sm-2' + = f.label :unique_ips_limit_time_window, 'IP expiration time', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :unique_ips_limit_time_window, class: 'form-control' .form-text.text-muted diff --git a/app/views/admin/application_settings/_terminal.html.haml b/app/views/admin/application_settings/_terminal.html.haml index 06db3fa89ce..70eabfcdae4 100644 --- a/app/views/admin/application_settings/_terminal.html.haml +++ b/app/views/admin/application_settings/_terminal.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group - = f.label :terminal_max_session_time, 'Max session time', class: 'control-label col-sm-2' + = f.label :terminal_max_session_time, 'Max session time', class: 'col-form-label col-sm-2' .col-sm-10 = f.number_field :terminal_max_session_time, class: 'form-control' .form-text.text-muted diff --git a/app/views/admin/application_settings/_visibility_and_access.html.haml b/app/views/admin/application_settings/_visibility_and_access.html.haml index 323967cd38c..5506ceab58f 100644 --- a/app/views/admin/application_settings/_visibility_and_access.html.haml +++ b/app/views/admin/application_settings/_visibility_and_access.html.haml @@ -3,23 +3,23 @@ %fieldset .form-group - = f.label :default_branch_protection, class: 'control-label col-sm-2' + = f.label :default_branch_protection, class: 'col-form-label col-sm-2' .col-sm-10 = f.select :default_branch_protection, options_for_select(Gitlab::Access.protection_options, @application_setting.default_branch_protection), {}, class: 'form-control' .form-group.visibility-level-setting - = f.label :default_project_visibility, class: 'control-label col-sm-2' + = f.label :default_project_visibility, class: 'col-form-label col-sm-2' .col-sm-10 = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new) .form-group.visibility-level-setting - = f.label :default_snippet_visibility, class: 'control-label col-sm-2' + = f.label :default_snippet_visibility, class: 'col-form-label col-sm-2' .col-sm-10 = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: ProjectSnippet.new) .form-group.visibility-level-setting - = f.label :default_group_visibility, class: 'control-label col-sm-2' + = f.label :default_group_visibility, class: 'col-form-label col-sm-2' .col-sm-10 = render('shared/visibility_radios', model_method: :default_group_visibility, form: f, selected_level: @application_setting.default_group_visibility, form_model: Group.new) .form-group - = f.label :restricted_visibility_levels, class: 'control-label col-sm-2' + = f.label :restricted_visibility_levels, class: 'col-form-label col-sm-2' .col-sm-10 - checkbox_name = 'application_setting[restricted_visibility_levels][]' = hidden_field_tag(checkbox_name) @@ -30,7 +30,7 @@ Selected levels cannot be used by non-admin users for projects or snippets. If the public level is restricted, user profiles are only visible to logged in users. .form-group - = f.label :import_sources, class: 'control-label col-sm-2' + = f.label :import_sources, class: 'col-form-label col-sm-2' .col-sm-10 - import_sources_checkboxes('import-sources-help').each do |source| .form-check= source @@ -50,7 +50,7 @@ Project export enabled .form-group - %label.control-label.col-sm-2 Enabled Git access protocols + %label.col-form-label.col-sm-2 Enabled Git access protocols .col-sm-10 = select(:application_setting, :enabled_git_access_protocol, [['Both SSH and HTTP(S)', nil], ['Only SSH', 'ssh'], ['Only HTTP(S)', 'http']], {}, class: 'form-control') %span.form-text.text-muted#clone-protocol-help @@ -59,7 +59,7 @@ - ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type| - field_name = :"#{type}_key_restriction" .form-group - = f.label field_name, "#{type.upcase} SSH keys", class: 'control-label col-sm-2' + = f.label field_name, "#{type.upcase} SSH keys", class: 'col-form-label col-sm-2' .col-sm-10 = f.select field_name, key_restriction_options_for_select(type), {}, class: 'form-control' diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml index eb29f17af0d..ee6185847db 100644 --- a/app/views/admin/applications/_form.html.haml +++ b/app/views/admin/applications/_form.html.haml @@ -2,13 +2,13 @@ = form_errors(application) = content_tag :div, class: 'form-group' do - = f.label :name, class: 'col-sm-2 control-label' + = f.label :name, class: 'col-sm-2 col-form-label' .col-sm-10 = f.text_field :name, class: 'form-control' = doorkeeper_errors_for application, :name = content_tag :div, class: 'form-group' do - = f.label :redirect_uri, class: 'col-sm-2 control-label' + = f.label :redirect_uri, class: 'col-sm-2 col-form-label' .col-sm-10 = f.text_area :redirect_uri, class: 'form-control' = doorkeeper_errors_for application, :redirect_uri @@ -21,14 +21,14 @@ for local tests = content_tag :div, class: 'form-group' do - = f.label :trusted, class: 'col-sm-2 control-label' + = f.label :trusted, class: 'col-sm-2 col-form-label' .col-sm-10 = f.check_box :trusted %span.form-text.text-muted Trusted applications are automatically authorized on GitLab OAuth flow. .form-group - = f.label :scopes, class: 'col-sm-2 control-label' + = f.label :scopes, class: 'col-sm-2 col-form-label' .col-sm-10 = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml index 1c979286e43..5fe7b2eb7db 100644 --- a/app/views/admin/broadcast_messages/_form.html.haml +++ b/app/views/admin/broadcast_messages/_form.html.haml @@ -10,7 +10,7 @@ = form_errors(@broadcast_message) .form-group - = f.label :message, class: 'control-label' + = f.label :message, class: 'col-form-label' .col-sm-10 = f.text_area :message, class: "form-control js-autosize", required: true, @@ -19,19 +19,19 @@ .col-sm-10.col-sm-offset-2 = link_to 'Customize colors', '#', class: 'js-toggle-colors-link' .form-group.js-toggle-colors-container.d-none - = f.label :color, "Background Color", class: 'control-label' + = f.label :color, "Background Color", class: 'col-form-label' .col-sm-10 = f.color_field :color, class: "form-control" .form-group.js-toggle-colors-container.d-none - = f.label :font, "Font Color", class: 'control-label' + = f.label :font, "Font Color", class: 'col-form-label' .col-sm-10 = f.color_field :font, class: "form-control" .form-group - = f.label :starts_at, class: 'control-label' + = f.label :starts_at, class: 'col-form-label' .col-sm-10.datetime-controls = f.datetime_select :starts_at, {}, class: 'form-control form-control-inline' .form-group - = f.label :ends_at, class: 'control-label' + = f.label :ends_at, class: 'col-form-label' .col-sm-10.datetime-controls = f.datetime_select :ends_at, {}, class: 'form-control form-control-inline' .form-actions diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index d9f05003904..07be4a6fa19 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -3,7 +3,7 @@ = render 'shared/group_form', f: f .form-group.group-description-holder - = f.label :avatar, "Group avatar", class: 'control-label' + = f.label :avatar, "Group avatar", class: 'col-form-label' .col-sm-10 = render 'shared/choose_group_avatar_button', f: f diff --git a/app/views/admin/identities/_form.html.haml b/app/views/admin/identities/_form.html.haml index 5381b854f5c..8a415c58ae6 100644 --- a/app/views/admin/identities/_form.html.haml +++ b/app/views/admin/identities/_form.html.haml @@ -2,12 +2,12 @@ = form_errors(@identity) .form-group - = f.label :provider, class: 'control-label' + = f.label :provider, class: 'col-form-label' .col-sm-10 - values = Gitlab::Auth::OAuth::Provider.providers.map { |name| ["#{Gitlab::Auth::OAuth::Provider.label_for(name)} (#{name})", name] } = f.select :provider, values, { allow_blank: false }, class: 'form-control' .form-group - = f.label :extern_uid, "Identifier", class: 'control-label' + = f.label :extern_uid, "Identifier", class: 'col-form-label' .col-sm-10 = f.text_field :extern_uid, class: 'form-control', required: true diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml index 458124ef198..aa41807dfcc 100644 --- a/app/views/admin/labels/_form.html.haml +++ b/app/views/admin/labels/_form.html.haml @@ -2,15 +2,15 @@ = form_errors(@label) .form-group - = f.label :title, class: 'control-label' + = f.label :title, class: 'col-form-label' .col-sm-10 = f.text_field :title, class: "form-control", required: true .form-group - = f.label :description, class: 'control-label' + = f.label :description, class: 'col-form-label' .col-sm-10 = f.text_field :description, class: "form-control js-quick-submit" .form-group - = f.label :color, "Background color", class: 'control-label' + = f.label :color, "Background color", class: 'col-form-label' .col-sm-10 .input-group .input-group-addon.label-color-preview diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index fd22fda5c73..09652054d09 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -116,7 +116,7 @@ .card-body = form_for @project, url: transfer_admin_project_path(@project), method: :put, html: { class: 'form-horizontal' } do |f| .form-group - = f.label :new_namespace_id, "Namespace", class: 'control-label' + = f.label :new_namespace_id, "Namespace", class: 'col-form-label' .col-sm-10 .dropdown = dropdown_toggle('Search for Namespace', { toggle: 'dropdown', field_name: 'new_namespace_id' }, { toggle_class: 'js-namespace-select large' }) diff --git a/app/views/admin/users/_access_levels.html.haml b/app/views/admin/users/_access_levels.html.haml index 794aaec89bd..35a331283ab 100644 --- a/app/views/admin/users/_access_levels.html.haml +++ b/app/views/admin/users/_access_levels.html.haml @@ -1,15 +1,15 @@ %fieldset %legend Access .form-group - = f.label :projects_limit, class: 'control-label' + = f.label :projects_limit, class: 'col-form-label' .col-sm-10= f.number_field :projects_limit, min: 0, max: Gitlab::Database::MAX_INT_VALUE, class: 'form-control' .form-group - = f.label :can_create_group, class: 'control-label' + = f.label :can_create_group, class: 'col-form-label' .col-sm-10= f.check_box :can_create_group .form-group - = f.label :access_level, class: 'control-label' + = f.label :access_level, class: 'col-form-label' .col-sm-10 - editing_current_user = (current_user == @user) @@ -29,7 +29,7 @@ You cannot remove your own admin rights. .form-group - = f.label :external, class: 'control-label' + = f.label :external, class: 'col-form-label' .col-sm-10 = f.check_box :external do External diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml index e911af3f6f9..1c8781b79fd 100644 --- a/app/views/admin/users/_form.html.haml +++ b/app/views/admin/users/_form.html.haml @@ -5,17 +5,17 @@ %fieldset %legend Account .form-group - = f.label :name, class: 'control-label' + = f.label :name, class: 'col-form-label' .col-sm-10 = f.text_field :name, required: true, autocomplete: 'off', class: 'form-control' %span.help-inline * required .form-group - = f.label :username, class: 'control-label' + = f.label :username, class: 'col-form-label' .col-sm-10 = f.text_field :username, required: true, autocomplete: 'off', autocorrect: 'off', autocapitalize: 'off', spellcheck: false, class: 'form-control' %span.help-inline * required .form-group - = f.label :email, class: 'control-label' + = f.label :email, class: 'col-form-label' .col-sm-10 = f.text_field :email, required: true, autocomplete: 'off', class: 'form-control' %span.help-inline * required @@ -24,7 +24,7 @@ %fieldset %legend Password .form-group - = f.label :password, class: 'control-label' + = f.label :password, class: 'col-form-label' .col-sm-10 %strong Reset link will be generated and sent to the user. @@ -34,10 +34,10 @@ %fieldset %legend Password .form-group - = f.label :password, class: 'control-label' + = f.label :password, class: 'col-form-label' .col-sm-10= f.password_field :password, disabled: f.object.force_random_password, class: 'form-control' .form-group - = f.label :password_confirmation, class: 'control-label' + = f.label :password_confirmation, class: 'col-form-label' .col-sm-10= f.password_field :password_confirmation, disabled: f.object.force_random_password, class: 'form-control' = render partial: 'access_levels', locals: { f: f } @@ -45,21 +45,21 @@ %fieldset %legend Profile .form-group - = f.label :avatar, class: 'control-label' + = f.label :avatar, class: 'col-form-label' .col-sm-10 = f.file_field :avatar .form-group - = f.label :skype, class: 'control-label' + = f.label :skype, class: 'col-form-label' .col-sm-10= f.text_field :skype, class: 'form-control' .form-group - = f.label :linkedin, class: 'control-label' + = f.label :linkedin, class: 'col-form-label' .col-sm-10= f.text_field :linkedin, class: 'form-control' .form-group - = f.label :twitter, class: 'control-label' + = f.label :twitter, class: 'col-form-label' .col-sm-10= f.text_field :twitter, class: 'form-control' .form-group - = f.label :website_url, 'Website', class: 'control-label' + = f.label :website_url, 'Website', class: 'col-form-label' .col-sm-10= f.text_field :website_url, class: 'form-control' .form-actions diff --git a/app/views/groups/_create_chat_team.html.haml b/app/views/groups/_create_chat_team.html.haml index 28bc9e2f299..9a3ff0313b5 100644 --- a/app/views/groups/_create_chat_team.html.haml +++ b/app/views/groups/_create_chat_team.html.haml @@ -1,5 +1,5 @@ .form-group - = f.label :create_chat_team, class: 'control-label' do + = f.label :create_chat_team, class: 'col-form-label' do %span.mattermost-icon = custom_icon('icon_mattermost') Mattermost diff --git a/app/views/groups/_group_admin_settings.html.haml b/app/views/groups/_group_admin_settings.html.haml index a20767aeab3..d7efbf33eb4 100644 --- a/app/views/groups/_group_admin_settings.html.haml +++ b/app/views/groups/_group_admin_settings.html.haml @@ -1,6 +1,6 @@ - if current_user.admin? .form-group - = f.label :lfs_enabled, 'Large File Storage', class: 'control-label' + = f.label :lfs_enabled, 'Large File Storage', class: 'col-form-label' .col-sm-10 .form-check = f.label :lfs_enabled do @@ -13,7 +13,7 @@ - if can? current_user, :admin_group, @group .form-group - = f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2' + = f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2' .col-sm-10 .form-check = f.label :require_two_factor_authentication do diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 92d27c00b92..a508e4ccbc2 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -28,7 +28,7 @@ = render 'shared/allow_request_access', form: f .form-group - %label.control-label + %label.col-form-label = s_("GroupSettings|Share with group lock") .col-sm-10 .form-check diff --git a/app/views/groups/milestones/_form.html.haml b/app/views/groups/milestones/_form.html.haml index a1be0d3220a..8d30cf95e3f 100644 --- a/app/views/groups/milestones/_form.html.haml +++ b/app/views/groups/milestones/_form.html.haml @@ -4,11 +4,11 @@ .col-md-6 .form-group - = f.label :title, "Title", class: "control-label" + = f.label :title, "Title", class: "col-form-label" .col-sm-10 = f.text_field :title, maxlength: 255, class: "form-control", required: true, autofocus: true .form-group.milestone-description - = f.label :description, "Description", class: "control-label" + = f.label :description, "Description", class: "col-form-label" .col-sm-10 = render layout: 'projects/md_preview', locals: { url: group_preview_markdown_path } do = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: 'Write milestone description...', supports_autocomplete: false diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index e9daac95ca1..9b9a16a2fd5 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -13,7 +13,7 @@ = render 'shared/group_form', f: f, autofocus: true .form-group.group-description-holder - = f.label :avatar, "Group avatar", class: 'control-label' + = f.label :avatar, "Group avatar", class: 'col-form-label' .col-sm-10 = render 'shared/choose_group_avatar_button', f: f diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 53509c17df1..ffb84dd6cc4 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -463,11 +463,11 @@ .example %form.form-horizontal .form-group - %label.col-sm-2.control-label{ :for => "inputEmail3" } Email + %label.col-sm-2.col-form-label{ :for => "inputEmail3" } Email .col-sm-10 %input#inputEmail3.form-control{ :placeholder => "Email", :type => "email" }/ .form-group - %label.col-sm-2.control-label{ :for => "inputPassword3" } Password + %label.col-sm-2.col-form-label{ :for => "inputPassword3" } Password .col-sm-10 %input#inputPassword3.form-control{ :placeholder => "Password", :type => "password" }/ .form-group diff --git a/app/views/import/fogbugz/new.html.haml b/app/views/import/fogbugz/new.html.haml index 5515fad6f48..6a0c5d99a11 100644 --- a/app/views/import/fogbugz/new.html.haml +++ b/app/views/import/fogbugz/new.html.haml @@ -11,15 +11,15 @@ In the next steps, you'll be able to map users and select the projects you want to import. .form-group - = label_tag :uri, 'FogBugz URL', class: 'control-label' + = label_tag :uri, 'FogBugz URL', class: 'col-form-label' .col-sm-4 = text_field_tag :uri, nil, placeholder: 'https://mycompany.fogbugz.com', class: 'form-control' .form-group - = label_tag :email, 'FogBugz Email', class: 'control-label' + = label_tag :email, 'FogBugz Email', class: 'col-form-label' .col-sm-4 = text_field_tag :email, nil, class: 'form-control' .form-group - = label_tag :password, 'FogBugz Password', class: 'control-label' + = label_tag :password, 'FogBugz Password', class: 'col-form-label' .col-sm-4 = password_field_tag :password, nil, class: 'form-control' .form-actions diff --git a/app/views/import/gitea/new.html.haml b/app/views/import/gitea/new.html.haml index 02a116f996b..228b14c9be0 100644 --- a/app/views/import/gitea/new.html.haml +++ b/app/views/import/gitea/new.html.haml @@ -12,11 +12,11 @@ = form_tag personal_access_token_import_gitea_path, class: 'form-horizontal' do .form-group - = label_tag :gitea_host_url, 'Gitea Host URL', class: 'control-label' + = label_tag :gitea_host_url, 'Gitea Host URL', class: 'col-form-label' .col-sm-4 = text_field_tag :gitea_host_url, nil, placeholder: 'https://try.gitea.io', class: 'form-control' .form-group - = label_tag :personal_access_token, 'Personal Access Token', class: 'control-label' + = label_tag :personal_access_token, 'Personal Access Token', class: 'col-form-label' .col-sm-4 = text_field_tag :personal_access_token, nil, class: 'form-control' .form-actions diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml index 2eb9fac57c3..1242274e6a9 100644 --- a/app/views/profiles/passwords/new.html.haml +++ b/app/views/profiles/passwords/new.html.haml @@ -12,13 +12,13 @@ - unless @user.password_automatically_set? .form-group - = f.label :current_password, class: 'control-label' + = f.label :current_password, class: 'col-form-label' .col-sm-10= f.password_field :current_password, required: true, class: 'form-control' .form-group - = f.label :password, class: 'control-label' + = f.label :password, class: 'col-form-label' .col-sm-10= f.password_field :password, required: true, class: 'form-control' .form-group - = f.label :password_confirmation, class: 'control-label' + = f.label :password_confirmation, class: 'col-form-label' .col-sm-10 = f.password_field :password_confirmation, required: true, class: 'form-control' .form-actions diff --git a/app/views/projects/blob/_new_dir.html.haml b/app/views/projects/blob/_new_dir.html.haml index 48ff66900be..c344daa4063 100644 --- a/app/views/projects/blob/_new_dir.html.haml +++ b/app/views/projects/blob/_new_dir.html.haml @@ -7,7 +7,7 @@ .modal-body = form_tag project_create_dir_path(@project, @id), method: :post, remote: false, class: 'form-horizontal js-create-dir-form js-quick-submit js-requires-input' do .form-group - = label_tag :dir_name, _('Directory name'), class: 'control-label' + = label_tag :dir_name, _('Directory name'), class: 'col-form-label' .col-sm-10 = text_field_tag :dir_name, params[:dir_name], required: true, class: 'form-control' diff --git a/app/views/projects/branches/new.html.haml b/app/views/projects/branches/new.html.haml index 3e12d951ebf..d77ef749d79 100644 --- a/app/views/projects/branches/new.html.haml +++ b/app/views/projects/branches/new.html.haml @@ -11,12 +11,12 @@ = form_tag namespace_project_branches_path, method: :post, id: "new-branch-form", class: "form-horizontal js-create-branch-form js-requires-input" do .form-group - = label_tag :branch_name, nil, class: 'control-label' + = label_tag :branch_name, nil, class: 'col-form-label' .col-sm-10 = text_field_tag :branch_name, params[:branch_name], required: true, autofocus: true, class: 'form-control js-branch-name' .form-text.text-muted.text-danger.js-branch-name-error .form-group - = label_tag :ref, 'Create from', class: 'control-label' + = label_tag :ref, 'Create from', class: 'col-form-label' .col-sm-10.create-from .dropdown = hidden_field_tag :ref, default_ref diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml index 21e4664d4e4..64abd1c254b 100644 --- a/app/views/projects/commit/_change.html.haml +++ b/app/views/projects/commit/_change.html.haml @@ -22,7 +22,7 @@ %p.append-bottom-20= description = form_tag [type.underscore, @project.namespace.becomes(Namespace), @project, commit], method: :post, remote: false, class: "form-horizontal js-#{type}-form js-requires-input" do .form-group.branch - = label_tag 'start_branch', branch_label, class: 'control-label' + = label_tag 'start_branch', branch_label, class: 'col-form-label' .col-sm-10 = 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 } }) diff --git a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml index 119c8e8e223..092090462c9 100644 --- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml +++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml @@ -1,6 +1,6 @@ .form-horizontal.resolve-conflicts-form .form-group - %label.col-sm-2.control-label{ "for" => "commit-message" } + %label.col-sm-2.col-form-label{ "for" => "commit-message" } #{ _('Commit message') } .col-sm-10 .commit-message-container diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml index 2e74b1b83cb..10b5c7d20a5 100644 --- a/app/views/projects/milestones/_form.html.haml +++ b/app/views/projects/milestones/_form.html.haml @@ -3,11 +3,11 @@ .row .col-md-6 .form-group - = f.label :title, "Title", class: "control-label" + = f.label :title, "Title", class: "col-form-label" .col-sm-10 = f.text_field :title, maxlength: 255, class: "form-control", required: true, autofocus: true .form-group.milestone-description - = f.label :description, "Description", class: "control-label" + = f.label :description, "Description", class: "col-form-label" .col-sm-10 = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project) } do = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: 'Write milestone description...' diff --git a/app/views/projects/pages_domains/_form.html.haml b/app/views/projects/pages_domains/_form.html.haml index d81b07832bb..acfb332cc0f 100644 --- a/app/views/projects/pages_domains/_form.html.haml +++ b/app/views/projects/pages_domains/_form.html.haml @@ -5,21 +5,21 @@ %p= msg .form-group - = f.label :domain, class: 'control-label' do + = f.label :domain, class: 'col-form-label' do Domain .col-sm-10 = f.text_field :domain, required: true, autocomplete: 'off', class: 'form-control', disabled: @domain.persisted? - if Gitlab.config.pages.external_https .form-group - = f.label :certificate, class: 'control-label' do + = f.label :certificate, class: 'col-form-label' do Certificate (PEM) .col-sm-10 = f.text_area :certificate, rows: 5, class: 'form-control' %span.help-inline Upload a certificate for your domain with all intermediates .form-group - = f.label :key, class: 'control-label' do + = f.label :key, class: 'col-form-label' do Key (PEM) .col-sm-10 = f.text_area :key, rows: 5, class: 'form-control' diff --git a/app/views/projects/pipelines/new.html.haml b/app/views/projects/pipelines/new.html.haml index f1ea7b12f81..3d5943e544e 100644 --- a/app/views/projects/pipelines/new.html.haml +++ b/app/views/projects/pipelines/new.html.haml @@ -8,7 +8,7 @@ = form_for @pipeline, as: :pipeline, url: project_pipelines_path(@project), html: { id: "new-pipeline-form", class: "form-horizontal js-new-pipeline-form js-requires-input" } do |f| = form_errors(@pipeline) .form-group - = f.label :ref, 'Create for', class: 'control-label' + = f.label :ref, 'Create for', class: 'col-form-label' .col-sm-10 = hidden_field_tag 'pipeline[ref]', params[:ref] || @project.default_branch = dropdown_tag(params[:ref] || @project.default_branch, diff --git a/app/views/projects/project_members/import.html.haml b/app/views/projects/project_members/import.html.haml index 755128af565..7691d432e30 100644 --- a/app/views/projects/project_members/import.html.haml +++ b/app/views/projects/project_members/import.html.haml @@ -7,7 +7,7 @@ %hr = form_tag apply_import_project_project_members_path(@project), method: 'post', class: 'form-horizontal' do .form-group - = label_tag :source_project_id, "Project", class: 'control-label' + = label_tag :source_project_id, "Project", class: 'col-form-label' .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(@projects, :id, :name_with_namespace), prompt: "Select project", class: "select2 lg", required: true) .form-actions diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml index 066b47aa211..f09672ad8fc 100644 --- a/app/views/projects/runners/_form.html.haml +++ b/app/views/projects/runners/_form.html.haml @@ -1,52 +1,52 @@ = form_for runner, url: runner_form_url, html: { class: 'form-horizontal' } do |f| = form_errors(runner) .form-group - = label :active, "Active", class: 'control-label' + = label :active, "Active", class: 'col-form-label' .col-sm-10 .form-check = f.check_box :active %span.light Paused Runners don't accept new jobs .form-group - = label :protected, "Protected", class: 'control-label' + = label :protected, "Protected", class: 'col-form-label' .col-sm-10 .form-check = f.check_box :access_level, {}, 'ref_protected', 'not_protected' %span.light This runner will only run on pipelines triggered on protected branches .form-group - = label :run_untagged, 'Run untagged jobs', class: 'control-label' + = label :run_untagged, 'Run untagged jobs', class: 'col-form-label' .col-sm-10 .form-check = f.check_box :run_untagged %span.light Indicates whether this runner can pick jobs without tags .form-group - = label :locked, 'Lock to current projects', class: 'control-label' + = label :locked, 'Lock to current projects', class: 'col-form-label' .col-sm-10 .form-check = f.check_box :locked %span.light When a runner is locked, it cannot be assigned to other projects .form-group - = label_tag :token, class: 'control-label' do + = label_tag :token, class: 'col-form-label' do Token .col-sm-10 = f.text_field :token, class: 'form-control', readonly: true .form-group - = label_tag :ip_address, class: 'control-label' do + = label_tag :ip_address, class: 'col-form-label' do IP Address .col-sm-10 = f.text_field :ip_address, class: 'form-control', readonly: true .form-group - = label_tag :description, class: 'control-label' do + = label_tag :description, class: 'col-form-label' do Description .col-sm-10 = f.text_field :description, class: 'form-control' .form-group - = label_tag :maximum_timeout_human_readable, class: 'control-label' do + = label_tag :maximum_timeout_human_readable, class: 'col-form-label' do Maximum job timeout .col-sm-10 = f.text_field :maximum_timeout_human_readable, class: 'form-control' .form-text.text-muted This timeout will take precedence when lower than Project-defined timeout .form-group - = label_tag :tag_list, class: 'control-label' do + = label_tag :tag_list, class: 'col-form-label' do Tags .col-sm-10 = f.text_field :tag_list, value: runner.tag_list.sort.join(', '), class: 'form-control' diff --git a/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml b/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml index e721d0e2ab9..9884b436e2b 100644 --- a/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml +++ b/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml @@ -18,21 +18,21 @@ .help-form .form-group - = label_tag :display_name, 'Display name', class: 'col-sm-2 col-12 control-label' + = label_tag :display_name, 'Display name', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.input-group = text_field_tag :display_name, "GitLab / #{@project.full_name}", class: 'form-control form-control-sm', readonly: 'readonly' .input-group-btn = clipboard_button(target: '#display_name') .form-group - = label_tag :description, 'Description', class: 'col-sm-2 col-12 control-label' + = label_tag :description, 'Description', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.input-group = text_field_tag :description, run_actions_text, class: 'form-control form-control-sm', readonly: 'readonly' .input-group-btn = clipboard_button(target: '#description') .form-group - = label_tag nil, 'Command trigger word', class: 'col-sm-2 col-12 control-label' + = label_tag nil, 'Command trigger word', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.text-block %p Fill in the word that works best for your team. %p @@ -42,43 +42,43 @@ %code= @project.full_path .form-group - = label_tag :request_url, 'Request URL', class: 'col-sm-2 col-12 control-label' + = label_tag :request_url, 'Request URL', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.input-group = text_field_tag :request_url, service_trigger_url(subject), class: 'form-control form-control-sm', readonly: 'readonly' .input-group-btn = clipboard_button(target: '#request_url') .form-group - = label_tag nil, 'Request method', class: 'col-sm-2 col-12 control-label' + = label_tag nil, 'Request method', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.text-block POST .form-group - = label_tag :response_username, 'Response username', class: 'col-sm-2 col-12 control-label' + = label_tag :response_username, 'Response username', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.input-group = text_field_tag :response_username, 'GitLab', class: 'form-control form-control-sm', readonly: 'readonly' .input-group-btn = clipboard_button(target: '#response_username') .form-group - = label_tag :response_icon, 'Response icon', class: 'col-sm-2 col-12 control-label' + = label_tag :response_icon, 'Response icon', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.input-group = text_field_tag :response_icon, asset_url('gitlab_logo.png'), class: 'form-control form-control-sm', readonly: 'readonly' .input-group-btn = clipboard_button(target: '#response_icon') .form-group - = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-12 control-label' + = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.text-block Yes .form-group - = label_tag :autocomplete_hint, 'Autocomplete hint', class: 'col-sm-2 col-12 control-label' + = label_tag :autocomplete_hint, 'Autocomplete hint', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.input-group = text_field_tag :autocomplete_hint, '[help]', class: 'form-control form-control-sm', readonly: 'readonly' .input-group-btn = clipboard_button(target: '#autocomplete_hint') .form-group - = label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-2 col-12 control-label' + = label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.input-group = text_field_tag :autocomplete_description, run_actions_text, class: 'form-control form-control-sm', readonly: 'readonly' .input-group-btn diff --git a/app/views/projects/services/slack_slash_commands/_help.html.haml b/app/views/projects/services/slack_slash_commands/_help.html.haml index 020db36027c..92f6a858ae0 100644 --- a/app/views/projects/services/slack_slash_commands/_help.html.haml +++ b/app/views/projects/services/slack_slash_commands/_help.html.haml @@ -26,7 +26,7 @@ .help-form .form-group - = label_tag nil, 'Command', class: 'col-sm-2 col-12 control-label' + = label_tag nil, 'Command', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.text-block %p Fill in the word that works best for your team. %p @@ -36,49 +36,49 @@ %code= @project.full_path .form-group - = label_tag :url, 'URL', class: 'col-sm-2 col-12 control-label' + = label_tag :url, 'URL', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.input-group = text_field_tag :url, service_trigger_url(subject), class: 'form-control form-control-sm', readonly: 'readonly' .input-group-btn = clipboard_button(target: '#url') .form-group - = label_tag nil, 'Method', class: 'col-sm-2 col-12 control-label' + = label_tag nil, 'Method', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.text-block POST .form-group - = label_tag :customize_name, 'Customize name', class: 'col-sm-2 col-12 control-label' + = label_tag :customize_name, 'Customize name', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.input-group = text_field_tag :customize_name, 'GitLab', class: 'form-control form-control-sm', readonly: 'readonly' .input-group-btn = clipboard_button(target: '#customize_name') .form-group - = label_tag nil, 'Customize icon', class: 'col-sm-2 col-12 control-label' + = label_tag nil, 'Customize icon', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.text-block = image_tag(asset_url('slash-command-logo.png'), width: 36, height: 36) = link_to('Download image', asset_url('gitlab_logo.png'), class: 'btn btn-sm', target: '_blank', rel: 'noopener noreferrer') .form-group - = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-12 control-label' + = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.text-block Show this command in the autocomplete list .form-group - = label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-2 col-12 control-label' + = label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.input-group = text_field_tag :autocomplete_description, run_actions_text, class: 'form-control form-control-sm', readonly: 'readonly' .input-group-btn = clipboard_button(target: '#autocomplete_description') .form-group - = label_tag :autocomplete_usage_hint, 'Autocomplete usage hint', class: 'col-sm-2 col-12 control-label' + = label_tag :autocomplete_usage_hint, 'Autocomplete usage hint', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.input-group = text_field_tag :autocomplete_usage_hint, '[help]', class: 'form-control form-control-sm', readonly: 'readonly' .input-group-btn = clipboard_button(target: '#autocomplete_usage_hint') .form-group - = label_tag :descriptive_label, 'Descriptive label', class: 'col-sm-2 col-12 control-label' + = label_tag :descriptive_label, 'Descriptive label', class: 'col-sm-2 col-12 col-form-label' .col-sm-10.col-12.input-group = text_field_tag :descriptive_label, 'Perform common operations on GitLab project', class: 'form-control form-control-sm', readonly: 'readonly' .input-group-btn diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml index df311973985..47fc945f7ee 100644 --- a/app/views/projects/tags/new.html.haml +++ b/app/views/projects/tags/new.html.haml @@ -12,11 +12,11 @@ = form_tag namespace_project_tags_path, method: :post, id: "new-tag-form", class: "form-horizontal common-note-form tag-form js-quick-submit js-requires-input" do .form-group - = label_tag :tag_name, nil, class: 'control-label' + = label_tag :tag_name, nil, class: 'col-form-label' .col-sm-10 = text_field_tag :tag_name, params[:tag_name], required: true, autofocus: true, class: 'form-control' .form-group - = label_tag :ref, 'Create from', class: 'control-label' + = label_tag :ref, 'Create from', class: 'col-form-label' .col-sm-10.create-from .dropdown = hidden_field_tag :ref, default_ref @@ -26,14 +26,14 @@ .form-text.text-muted = s_('TagsPage|Existing branch name, tag, or commit SHA') .form-group - = label_tag :message, nil, class: 'control-label' + = label_tag :message, nil, class: 'col-form-label' .col-sm-10 = text_area_tag :message, @message, required: false, class: 'form-control', rows: 5 .form-text.text-muted = s_('TagsPage|Optionally, add a message to the tag.') %hr .form-group - = label_tag :release_description, s_('TagsPage|Release notes'), class: 'control-label' + = label_tag :release_description, s_('TagsPage|Release notes'), class: 'col-form-label' .col-sm-10 = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project), referenced_users: true } do = render 'projects/zen', attr: :release_description, classes: 'note-textarea', placeholder: s_('TagsPage|Write your release notes or drag files here...'), current_text: @release_description diff --git a/app/views/shared/_commit_message_container.html.haml b/app/views/shared/_commit_message_container.html.haml index 932b3fa0a86..a22a329dbe9 100644 --- a/app/views/shared/_commit_message_container.html.haml +++ b/app/views/shared/_commit_message_container.html.haml @@ -1,7 +1,7 @@ .form-group.commit_message-group - nonce = SecureRandom.hex - descriptions = local_assigns.slice(:message_with_description, :message_without_description) - = label_tag "commit_message-#{nonce}", class: 'control-label' do + = label_tag "commit_message-#{nonce}", class: 'col-form-label' do #{ _('Commit message') } .col-sm-10 .commit-message-container diff --git a/app/views/shared/_field.html.haml b/app/views/shared/_field.html.haml index 2493108743b..0c8d90d92f5 100644 --- a/app/views/shared/_field.html.haml +++ b/app/views/shared/_field.html.haml @@ -11,9 +11,9 @@ .form-group - if type == "password" && value.present? - = form.label name, "Enter new #{title.downcase}", class: "control-label" + = form.label name, "Enter new #{title.downcase}", class: "col-form-label" - else - = form.label name, title, class: "control-label" + = form.label name, title, class: "col-form-label" .col-sm-10 - if type == 'text' = form.text_field name, class: "form-control", placeholder: placeholder, required: required, disabled: disabled diff --git a/app/views/shared/_group_form.html.haml b/app/views/shared/_group_form.html.haml index cb21f90696f..d01aa334351 100644 --- a/app/views/shared/_group_form.html.haml +++ b/app/views/shared/_group_form.html.haml @@ -3,7 +3,7 @@ - group_path << parent.full_path + '/' if parent .form-group - = f.label :path, class: 'control-label' do + = f.label :path, class: 'col-form-label' do Group path .col-sm-10 .input-group.gl-field-error-anchor @@ -25,7 +25,7 @@ = link_to 'Learn more', help_page_path('user/group/index', anchor: 'changing-a-groups-path'), target: '_blank' .form-group.group-name-holder - = f.label :name, class: 'control-label' do + = f.label :name, class: 'col-form-label' do Group name .col-sm-10 = f.text_field :name, class: 'form-control', @@ -33,7 +33,7 @@ title: 'You can choose a descriptive name different from the path.' .form-group.group-description-holder - = f.label :description, class: 'control-label' + = f.label :description, class: 'col-form-label' .col-sm-10 = f.text_area :description, maxlength: 250, class: 'form-control js-gfm-input', rows: 4 diff --git a/app/views/shared/_new_commit_form.html.haml b/app/views/shared/_new_commit_form.html.haml index 9221fd1e025..ab954d5857c 100644 --- a/app/views/shared/_new_commit_form.html.haml +++ b/app/views/shared/_new_commit_form.html.haml @@ -8,7 +8,7 @@ - else - if can?(current_user, :push_code, @project) .form-group.branch - = label_tag 'branch_name', _('Target Branch'), class: 'control-label' + = label_tag 'branch_name', _('Target Branch'), class: 'col-form-label' .col-sm-10 = text_field_tag 'branch_name', branch_name, required: true, class: "form-control js-branch-name ref-name" diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml index 63f33bf236a..07b1eabaf05 100644 --- a/app/views/shared/_service_settings.html.haml +++ b/app/views/shared/_service_settings.html.haml @@ -9,13 +9,13 @@ .service-settings - if @service.show_active_box? .form-group - = form.label :active, "Active", class: "control-label" + = form.label :active, "Active", class: "col-form-label" .col-sm-10 = form.check_box :active, disabled: disable_fields_service?(@service) - if @service.configurable_events.present? .form-group - = form.label :url, "Trigger", class: 'control-label' + = form.label :url, "Trigger", class: 'col-form-label' .col-sm-10 - @service.configurable_events.each do |event| diff --git a/app/views/shared/_visibility_level.html.haml b/app/views/shared/_visibility_level.html.haml index 192d2502aaf..eb132faa169 100644 --- a/app/views/shared/_visibility_level.html.haml +++ b/app/views/shared/_visibility_level.html.haml @@ -2,7 +2,7 @@ .form-group.visibility-level-setting - if with_label - = f.label :visibility_level, class: 'control-label' do + = f.label :visibility_level, class: 'col-form-label' do Visibility Level = link_to icon('question-circle'), help_page_path("public_access/public_access") %div{ :class => ("col-sm-10" if with_label) } diff --git a/app/views/shared/deploy_keys/_form.html.haml b/app/views/shared/deploy_keys/_form.html.haml index 87c2965bb21..e1eb1adb060 100644 --- a/app/views/shared/deploy_keys/_form.html.haml +++ b/app/views/shared/deploy_keys/_form.html.haml @@ -5,26 +5,26 @@ = form_errors(deploy_key) .form-group - = form.label :title, class: 'control-label' + = form.label :title, class: 'col-form-label' .col-sm-10= form.text_field :title, class: 'form-control' .form-group - if deploy_key.new_record? - = form.label :key, class: 'control-label' + = form.label :key, class: 'col-form-label' .col-sm-10 %p.light Paste a machine public key here. Read more about how to generate it = link_to 'here', help_page_path('ssh/README') = form.text_area :key, class: 'form-control thin_area', rows: 5 - else - = form.label :fingerprint, class: 'control-label' + = form.label :fingerprint, class: 'col-form-label' .col-sm-10 = form.text_field :fingerprint, class: 'form-control', readonly: 'readonly' - if deploy_keys_project.present? = form.fields_for :deploy_keys_projects, deploy_keys_project do |deploy_keys_project_form| .form-group - .control-label + .col-form-label .col-sm-10 = deploy_keys_project_form.label :can_push do = deploy_keys_project_form.check_box :can_push diff --git a/app/views/shared/form_elements/_description.html.haml b/app/views/shared/form_elements/_description.html.haml index 38e9899ca4b..d42b23843f5 100644 --- a/app/views/shared/form_elements/_description.html.haml +++ b/app/views/shared/form_elements/_description.html.haml @@ -10,7 +10,7 @@ - preview_url = preview_markdown_path(project) .form-group.detail-page-description - = form.label :description, 'Description', class: 'control-label' + = form.label :description, 'Description', class: 'col-form-label' .col-sm-10 = render layout: 'projects/md_preview', locals: { url: preview_url, referenced_users: true } do diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 6c8a441ed8c..e62fde003ce 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -12,7 +12,7 @@ and make sure your changes will not unintentionally remove theirs .form-group - = form.label :title, class: 'control-label' + = form.label :title, class: 'col-form-label' = render 'shared/issuable/form/template_selector', issuable: issuable = render 'shared/issuable/form/title', issuable: issuable, form: form, has_wip_commits: commits && commits.detect(&:work_in_progress?) diff --git a/app/views/shared/issuable/form/_branch_chooser.html.haml b/app/views/shared/issuable/form/_branch_chooser.html.haml index 9a589387255..fa92af7ab31 100644 --- a/app/views/shared/issuable/form/_branch_chooser.html.haml +++ b/app/views/shared/issuable/form/_branch_chooser.html.haml @@ -7,12 +7,12 @@ %hr - if issuable.new_record? .form-group - = form.label :source_branch, class: 'control-label' + = form.label :source_branch, class: 'col-form-label' .col-sm-10 .issuable-form-select-holder = form.select(:source_branch, [issuable.source_branch], {}, { class: 'source_branch select2 ref-name', disabled: true }) .form-group - = form.label :target_branch, class: 'control-label' + = form.label :target_branch, class: 'col-form-label' .col-sm-10.target-branch-select-dropdown-container .issuable-form-select-holder = form.hidden_field(:target_branch, diff --git a/app/views/shared/issuable/form/_contribution.html.haml b/app/views/shared/issuable/form/_contribution.html.haml index ec6f665b5fc..f12c23cbc64 100644 --- a/app/views/shared/issuable/form/_contribution.html.haml +++ b/app/views/shared/issuable/form/_contribution.html.haml @@ -8,7 +8,7 @@ %hr .form-group - .control-label + .col-form-label = _('Contribution') .col-sm-10 .form-check diff --git a/app/views/shared/issuable/form/_metadata.html.haml b/app/views/shared/issuable/form/_metadata.html.haml index 1608bd59cf1..4b05537b62a 100644 --- a/app/views/shared/issuable/form/_metadata.html.haml +++ b/app/views/shared/issuable/form/_metadata.html.haml @@ -15,13 +15,13 @@ - else = render "shared/issuable/form/metadata_merge_request_assignee", issuable: issuable, form: form, has_due_date: has_due_date .form-group.issue-milestone - = form.label :milestone_id, "Milestone", class: "control-label #{"col-lg-4" if has_due_date}" + = form.label :milestone_id, "Milestone", class: "col-form-label #{"col-lg-4" if has_due_date}" .col-sm-10{ class: ("col-lg-8" if has_due_date) } .issuable-form-select-holder = render "shared/issuable/milestone_dropdown", selected: issuable.milestone, name: "#{issuable.class.model_name.param_key}[milestone_id]", show_any: false, show_upcoming: false, show_started: false, extra_class: "js-issuable-form-dropdown js-dropdown-keep-input", dropdown_title: "Select milestone" .form-group - has_labels = @labels && @labels.any? - = form.label :label_ids, "Labels", class: "control-label #{"col-lg-4" if has_due_date}" + = form.label :label_ids, "Labels", class: "col-form-label #{"col-lg-4" if has_due_date}" = form.hidden_field :label_ids, multiple: true, value: '' .col-sm-10{ class: "#{"col-lg-8" if has_due_date} #{'issuable-form-padding-top' if !has_labels}" } .issuable-form-select-holder @@ -29,7 +29,7 @@ - if has_due_date .col-lg-6 .form-group - = form.label :due_date, "Due date", class: "control-label" + = form.label :due_date, "Due date", class: "col-form-label" .col-sm-10 .issuable-form-select-holder = form.text_field :due_date, id: "issuable-due-date", class: "datepicker form-control", placeholder: "Select due date" diff --git a/app/views/shared/issuable/form/_metadata_issue_assignee.html.haml b/app/views/shared/issuable/form/_metadata_issue_assignee.html.haml index 567cde764e2..b25867a49f6 100644 --- a/app/views/shared/issuable/form/_metadata_issue_assignee.html.haml +++ b/app/views/shared/issuable/form/_metadata_issue_assignee.html.haml @@ -1,4 +1,4 @@ -= form.label :assignee_ids, "Assignee", class: "control-label #{"col-lg-4" if has_due_date}" += form.label :assignee_ids, "Assignee", class: "col-form-label #{"col-lg-4" if has_due_date}" .col-sm-10{ class: ("col-lg-8" if has_due_date) } .issuable-form-select-holder.selectbox - issuable.assignees.each do |assignee| diff --git a/app/views/shared/issuable/form/_metadata_merge_request_assignee.html.haml b/app/views/shared/issuable/form/_metadata_merge_request_assignee.html.haml index d0ea4e149df..a60093fa0be 100644 --- a/app/views/shared/issuable/form/_metadata_merge_request_assignee.html.haml +++ b/app/views/shared/issuable/form/_metadata_merge_request_assignee.html.haml @@ -1,4 +1,4 @@ -= form.label :assignee_id, "Assignee", class: "control-label #{"col-lg-4" if has_due_date}" += form.label :assignee_id, "Assignee", class: "col-form-label #{"col-lg-4" if has_due_date}" .col-sm-10{ class: ("col-lg-8" if has_due_date) } .issuable-form-select-holder = form.hidden_field :assignee_id diff --git a/app/views/shared/labels/_form.html.haml b/app/views/shared/labels/_form.html.haml index 2ef464256b3..78b39a7633c 100644 --- a/app/views/shared/labels/_form.html.haml +++ b/app/views/shared/labels/_form.html.haml @@ -2,15 +2,15 @@ = form_errors(@label) .form-group - = f.label :title, class: 'control-label' + = f.label :title, class: 'col-form-label' .col-sm-10 = f.text_field :title, class: "form-control", required: true, autofocus: true .form-group - = f.label :description, class: 'control-label' + = f.label :description, class: 'col-form-label' .col-sm-10 = f.text_field :description, class: "form-control js-quick-submit" .form-group - = f.label :color, "Background color", class: 'control-label' + = f.label :color, "Background color", class: 'col-form-label' .col-sm-10 .input-group .input-group-addon.label-color-preview diff --git a/app/views/shared/milestones/_form_dates.html.haml b/app/views/shared/milestones/_form_dates.html.haml index b1cfb1609b6..b68da4a5b96 100644 --- a/app/views/shared/milestones/_form_dates.html.haml +++ b/app/views/shared/milestones/_form_dates.html.haml @@ -1,12 +1,12 @@ .col-md-6 .form-group - = f.label :start_date, "Start Date", class: "control-label" + = f.label :start_date, "Start Date", class: "col-form-label" .col-sm-10 = f.text_field :start_date, class: "datepicker form-control", placeholder: "Select start date" %a.inline.float-right.prepend-top-5.js-clear-start-date{ href: "#" } Clear start date .col-md-6 .form-group - = f.label :due_date, "Due Date", class: "control-label" + = f.label :due_date, "Due Date", class: "col-form-label" .col-sm-10 = f.text_field :due_date, class: "datepicker form-control", placeholder: "Select due date" %a.inline.float-right.prepend-top-5.js-clear-due-date{ href: "#" } Clear due date diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml index c75c882a693..9c2c251e779 100644 --- a/app/views/shared/snippets/_form.html.haml +++ b/app/views/shared/snippets/_form.html.haml @@ -6,7 +6,7 @@ = form_errors(@snippet) .form-group - = f.label :title, class: 'control-label' + = f.label :title, class: 'col-form-label' .col-sm-10 = f.text_field :title, class: 'form-control', required: true, autofocus: true @@ -16,7 +16,7 @@ .file-editor .form-group - = f.label :file_name, "File", class: 'control-label' + = f.label :file_name, "File", class: 'col-form-label' .col-sm-10 .file-holder.snippet .js-file-title.file-title |