[skip ci] .control-label to .col-form-label

31 files changed, 108 insertions, 108 deletions

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