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

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

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

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'

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

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

app/views/projects/merge_requests/conflicts/_submit_form.html.haml

 .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

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...'

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'

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,

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

app/views/projects/runners/_form.html.haml

 = 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'

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

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

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

app/views/shared/_commit_message_container.html.haml

 .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

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

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

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"

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|

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