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

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

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

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

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

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'

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

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

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

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

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  

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' })

app/views/admin/users/_access_levels.html.haml

 %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

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

app/views/groups/_create_chat_team.html.haml

 .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

app/views/groups/_group_admin_settings.html.haml

 - 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

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

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

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

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

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