Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/badges/components/badge.vue

@@ -84,7 +84,7 @@ export default {
 
     <div v-show="hasError" class="btn-group">
       <div class="btn btn-default btn-sm disabled">
-        <gl-icon :size="16" class="gl-ml-3 gl-mr-3" name="doc-image" aria-hidden="true" />
+        <gl-icon :size="16" class="gl-ml-3 gl-mr-3" name="doc-image" />
       </div>
       <div class="btn btn-default btn-sm disabled">
         <span class="gl-ml-3 gl-mr-3">{{ s__('Badges|No badge image') }}</span>

app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue

@@ -179,13 +179,13 @@ export default {
               'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral'
             "
             target="_blank"
-            >{{ content }} <gl-icon name="external-link" aria-hidden="true"
+            >{{ content }} <gl-icon name="external-link"
           /></gl-link>
         </template>
 
         <template #docsLink="{ content }">
           <gl-link :href="docsUrl" target="_blank"
-            >{{ content }} <gl-icon name="external-link" aria-hidden="true"
+            >{{ content }} <gl-icon name="external-link"
           /></gl-link>
         </template>
 

app/assets/javascripts/cycle_analytics/components/limit_warning_component.vue

@@ -27,7 +27,6 @@ export default {
         ),
       }"
       name="warning"
-      aria-hidden="true"
     />
     {{ n__('Showing %d event', 'Showing %d events', 50) }}
   </span>

app/assets/javascripts/diffs/components/diff_expansion_cell.vue

@@ -226,11 +226,11 @@ export default {
       class="gl-mx-2 gl-cursor-pointer js-unfold-down gl-display-inline-block gl-py-4"
       @click="handleExpandLines(EXPAND_DOWN)"
     >
-      <gl-icon :size="12" name="expand-down" aria-hidden="true" />
+      <gl-icon :size="12" name="expand-down" />
       <span>{{ $options.i18n.showMore }}</span>
     </a>
     <a class="gl-mx-2 cursor-pointer js-unfold-all" @click="handleExpandLines()">
-      <gl-icon :size="12" name="expand" aria-hidden="true" />
+      <gl-icon :size="12" name="expand" />
       <span>{{ $options.i18n.showAll }}</span>
     </a>
     <a
@@ -238,7 +238,7 @@ export default {
       class="gl-mx-2 gl-cursor-pointer js-unfold gl-display-inline-block gl-py-4"
       @click="handleExpandLines(EXPAND_UP)"
     >
-      <gl-icon :size="12" name="expand-up" aria-hidden="true" />
+      <gl-icon :size="12" name="expand-up" />
       <span>{{ $options.i18n.showMore }}</span>
     </a>
   </div>

app/assets/javascripts/diffs/components/diff_file_header.vue

@@ -221,7 +221,6 @@ export default {
         ref="collapseIcon"
         :name="collapseIcon"
         :size="16"
-        aria-hidden="true"
         class="diff-toggle-caret gl-mr-2"
         @click.stop="handleToggleFile"
       />

app/assets/javascripts/error_tracking/components/stacktrace_entry.vue

@@ -80,7 +80,7 @@ export default {
     <div ref="header" class="file-title file-title-flex-parent">
       <div class="file-header-content d-flex align-content-center">
         <div v-if="hasCode" class="d-inline-block cursor-pointer" @click="toggle()">
-          <gl-icon :name="collapseIcon" :size="16" aria-hidden="true" class="gl-mr-2" />
+          <gl-icon :name="collapseIcon" :size="16" class="gl-mr-2" />
         </div>
         <file-icon :file-name="filePath" :size="18" aria-hidden="true" css-classes="gl-mr-2" />
         <strong

app/assets/javascripts/groups/components/group_folder.vue

@@ -49,7 +49,7 @@ export default {
     />
     <li v-if="hasMoreChildren" class="group-row">
       <a :href="parentGroup.relativePath" class="group-row-contents has-more-items py-2">
-        <gl-icon name="external-link" aria-hidden="true" /> {{ moreChildrenStats }}
+        <gl-icon name="external-link" /> {{ moreChildrenStats }}
       </a>
     </li>
   </ul>

app/assets/javascripts/ide/components/file_templates/dropdown.vue

@@ -86,7 +86,7 @@ export default {
           type="search"
           class="dropdown-input-field qa-dropdown-filter-input"
         />
-        <gl-icon name="search" class="dropdown-input-search" aria-hidden="true" />
+        <gl-icon name="search" class="dropdown-input-search" />
       </div>
       <div class="dropdown-content">
         <gl-loading-icon v-if="showLoading" size="lg" />

app/assets/javascripts/ide/components/jobs/detail.vue

@@ -92,7 +92,7 @@ export default {
           class="controllers-buttons"
           target="_blank"
         >
-          <gl-icon name="doc-text" aria-hidden="true" />
+          <gl-icon name="doc-text" />
         </a>
         <scroll-button :disabled="isScrolledToTop" direction="up" @click="scrollUp" />
         <scroll-button :disabled="isScrolledToBottom" direction="down" @click="scrollDown" />

app/assets/javascripts/issue_show/components/fields/description_template.vue

@@ -61,11 +61,7 @@ export default {
       data-toggle="dropdown"
     >
       <span class="dropdown-toggle-text">{{ __('Choose a template') }}</span>
-      <gl-icon
-        name="chevron-down"
-        class="gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
-        aria-hidden="true"
-      />
+      <gl-icon name="chevron-down" class="gl-absolute gl-top-3 gl-right-3 gl-text-gray-500" />
     </button>
     <div class="dropdown-menu dropdown-select">
       <div class="dropdown-title gl-display-flex gl-justify-content-center">
@@ -75,7 +71,7 @@ export default {
           :aria-label="__('Close')"
           type="button"
         >
-          <gl-icon name="close" class="dropdown-menu-close-icon" :aria-hidden="true" />
+          <gl-icon name="close" class="dropdown-menu-close-icon" />
         </button>
       </div>
       <div class="dropdown-input">
@@ -85,7 +81,7 @@ export default {
           :placeholder="__('Filter')"
           autocomplete="off"
         />
-        <gl-icon name="search" class="dropdown-input-search" aria-hidden="true" />
+        <gl-icon name="search" class="dropdown-input-search" />
         <gl-icon
           name="close"
           class="dropdown-input-clear js-dropdown-input-clear"

app/assets/javascripts/issue_show/components/header_actions.vue

@@ -242,7 +242,7 @@ export default {
       right
     >
       <template #button-content>
-        <gl-icon name="ellipsis_v" aria-hidden="true" />
+        <gl-icon name="ellipsis_v" />
         <span class="gl-sr-only">{{ dropdownText }}</span>
       </template>
 

app/assets/javascripts/notes/components/note_header.vue

@@ -142,7 +142,7 @@ export default {
         type="button"
         @click="handleToggle"
       >
-        <gl-icon ref="chevronIcon" :name="toggleChevronIconName" aria-hidden="true" />
+        <gl-icon ref="chevronIcon" :name="toggleChevronIconName" />
         {{ __('Toggle thread') }}
       </button>
     </div>

app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue

@@ -94,11 +94,7 @@ export default {
           {{ optionName }}
         </option>
       </select>
-      <gl-icon
-        name="chevron-down"
-        aria-hidden="true"
-        class="gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
-      />
+      <gl-icon name="chevron-down" class="gl-absolute gl-top-3 gl-right-3 gl-text-gray-500" />
     </div>
   </div>
 </template>

app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue

@@ -341,7 +341,6 @@ export default {
             </select>
             <gl-icon
               name="chevron-down"
-              aria-hidden="true"
               data-hidden="true"
               class="gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
             />
@@ -573,7 +572,6 @@ export default {
             </select>
             <gl-icon
               name="chevron-down"
-              aria-hidden="true"
               data-hidden="true"
               class="gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
             />

app/assets/javascripts/pipelines/components/pipelines_list/time_ago.vue

@@ -53,12 +53,12 @@ export default {
     <div class="table-mobile-header" role="rowheader">{{ s__('Pipeline|Duration') }}</div>
     <div class="table-mobile-content">
       <p v-if="hasDuration" class="duration">
-        <gl-icon name="timer" class="gl-vertical-align-baseline!" aria-hidden="true" />
+        <gl-icon name="timer" class="gl-vertical-align-baseline!" />
         {{ durationFormatted }}
       </p>
 
       <p v-if="hasFinishedTime" class="finished-at d-none d-md-block">
-        <gl-icon name="calendar" class="gl-vertical-align-baseline!" aria-hidden="true" />
+        <gl-icon name="calendar" class="gl-vertical-align-baseline!" />
 
         <time
           v-gl-tooltip

app/assets/javascripts/related_issues/components/issue_token.vue

@@ -114,7 +114,7 @@ export default {
       class="js-issue-token-remove-button"
       @click="onRemoveRequest"
     >
-      <gl-icon name="close" aria-hidden="true" />
+      <gl-icon name="close" />
     </button>
   </div>
 </template>

app/assets/javascripts/repository/components/preview/index.vue

@@ -52,7 +52,7 @@ export default {
   <article class="file-holder limited-width-container readme-holder">
     <div class="js-file-title file-title-flex-parent">
       <div class="file-header-content">
-        <gl-icon name="doc-text" aria-hidden="true" />
+        <gl-icon name="doc-text" />
         <gl-link :href="blob.webPath">
           <strong>{{ blob.name }}</strong>
         </gl-link>

app/assets/javascripts/sidebar/components/assignees/assignee_title.vue

@@ -66,7 +66,7 @@ export default {
       href="#"
       role="button"
     >
-      <gl-icon aria-hidden="true" data-hidden="true" name="chevron-double-lg-right" :size="12" />
+      <gl-icon data-hidden="true" name="chevron-double-lg-right" :size="12" />
     </a>
   </div>
 </template>

app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue

@@ -77,7 +77,7 @@ export default {
       class="sidebar-collapsed-icon"
       @click="toggleForm"
     >
-      <gl-icon :name="confidentialityIcon" aria-hidden="true" />
+      <gl-icon :name="confidentialityIcon" />
     </div>
     <div class="title hide-collapsed">
       {{ __('Confidentiality') }}
@@ -101,16 +101,11 @@ export default {
         :issuable-type="issuableType"
       />
       <div v-if="!confidential" class="no-value sidebar-item-value" data-testid="not-confidential">
-        <gl-icon :size="16" name="eye" aria-hidden="true" class="sidebar-item-icon inline" />
+        <gl-icon :size="16" name="eye" class="sidebar-item-icon inline" />
         {{ __('Not confidential') }}
       </div>
       <div v-else class="value sidebar-item-value hide-collapsed">
-        <gl-icon
-          :size="16"
-          name="eye-slash"
-          aria-hidden="true"
-          class="sidebar-item-icon inline is-active"
-        />
+        <gl-icon :size="16" name="eye-slash" class="sidebar-item-icon inline is-active" />
         {{ confidentialText }}
       </div>
     </div>

app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue

@@ -59,7 +59,7 @@ export default {
       href="#"
       role="button"
     >
-      <gl-icon aria-hidden="true" data-hidden="true" name="chevron-double-lg-right" :size="12" />
+      <gl-icon data-hidden="true" name="chevron-double-lg-right" :size="12" />
     </a>
   </div>
 </template>

app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue

@@ -114,12 +114,7 @@ export default {
       class="sidebar-collapsed-icon"
       @click="onClickCollapsedIcon"
     >
-      <gl-icon
-        :name="notificationIcon"
-        :size="16"
-        aria-hidden="true"
-        class="sidebar-item-icon is-active"
-      />
+      <gl-icon :name="notificationIcon" :size="16" class="sidebar-item-icon is-active" />
     </span>
     <span class="issuable-header-text hide-collapsed float-left"> {{ notificationText }} </span>
     <toggle-button

app/assets/javascripts/vue_shared/components/awards_list.vue

@@ -174,13 +174,13 @@ export default {
         :aria-label="__('Add reaction')"
       >
         <span class="reaction-control-icon reaction-control-icon-neutral">
-          <gl-icon aria-hidden="true" name="slight-smile" />
+          <gl-icon name="slight-smile" />
         </span>
         <span class="reaction-control-icon reaction-control-icon-positive">
-          <gl-icon aria-hidden="true" name="smiley" />
+          <gl-icon name="smiley" />
         </span>
         <span class="reaction-control-icon reaction-control-icon-super-positive">
-          <gl-icon aria-hidden="true" name="smile" />
+          <gl-icon name="smile" />
         </span>
       </gl-button>
     </div>

app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue

@@ -219,7 +219,7 @@ export default {
         <span v-if="utc" class="gl-text-gray-500 gl-font-weight-bold gl-font-sm">{{
           __('UTC')
         }}</span>
-        <gl-icon class="gl-dropdown-caret" name="chevron-down" aria-hidden="true" />
+        <gl-icon class="gl-dropdown-caret" name="chevron-down" />
       </template>
 
       <div class="d-flex justify-content-between gl-p-2">

app/assets/javascripts/vue_shared/components/dismissible_container.vue

@@ -45,7 +45,7 @@ export default {
           data-testid="close"
           @click="dismiss"
         >
-          <gl-icon name="close" aria-hidden="true" class="gl-text-gray-500" />
+          <gl-icon name="close" class="gl-text-gray-500" />
         </button>
       </div>
     </div>

app/assets/javascripts/vue_shared/components/dropdown/dropdown_search_input.vue

@@ -44,6 +44,6 @@ export default {
       type="search"
       autocomplete="off"
     />
-    <gl-icon name="search" class="dropdown-input-search" aria-hidden="true" data-hidden="true" />
+    <gl-icon name="search" class="dropdown-input-search" data-hidden="true" />
   </div>
 </template>

app/assets/javascripts/vue_shared/components/file_finder/index.vue

@@ -234,7 +234,6 @@ export default {
           name="search"
           class="dropdown-input-search"
           :class="{ hidden: showClearInputButton }"
-          aria-hidden="true"
         />
         <gl-icon
           name="close"

app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_header.vue

@@ -16,7 +16,7 @@ export default {
       type="button"
       class="dropdown-title-button dropdown-menu-close gl-ml-auto"
     >
-      <gl-icon name="close" aria-hidden="true" class="dropdown-menu-close-icon" />
+      <gl-icon name="close" class="dropdown-menu-close-icon" />
     </button>
   </div>
 </template>

app/controllers/graphql_controller.rb

@@ -37,7 +37,11 @@ class GraphqlController < ApplicationController
   rescue_from StandardError do |exception|
     log_exception(exception)
 
-    render_error("Internal server error")
+    if Rails.env.test? || Rails.env.development?
+      render_error("Internal server error: #{exception.message}")
+    else
+      render_error("Internal server error")
+    end
   end
 
   rescue_from Gitlab::Graphql::Variables::Invalid do |exception|

app/views/projects/commit/_commit_box.html.haml

@@ -30,7 +30,7 @@
     .dropdown.inline
       %a.btn.gl-button.dropdown-toggle.qa-options-button.d-md-inline{ data: { toggle: "dropdown" } }
         %span= _('Options')
-        = icon('caret-down')
+        = sprite_icon('chevron-down', css_class: 'gl-text-gray-500')
       %ul.dropdown-menu.dropdown-menu-right
         %li.d-block.d-sm-none
           = link_to project_tree_path(@project, @commit) do

app/views/projects/issues/_new_branch.html.haml

@@ -21,8 +21,8 @@
       %button.btn.js-create-merge-request.btn-success.btn-inverted{ type: 'button', data: { action: data_action } }
         = value
 
-      %button.btn.create-merge-request-dropdown-toggle.dropdown-toggle.btn-success.btn-inverted.js-dropdown-toggle.flex-grow-0{ type: 'button', data: { dropdown: { trigger: '#create-merge-request-dropdown' }, display: 'static' } }
-        = icon('caret-down')
+      %button.btn.gl-button.create-merge-request-dropdown-toggle.dropdown-toggle.btn-success.btn-inverted.js-dropdown-toggle.gl-flex-grow-0.gl-h-7{ type: 'button', data: { dropdown: { trigger: '#create-merge-request-dropdown' }, display: 'static' } }
+        = sprite_icon('chevron-down')
 
       .droplab-dropdown
         %ul#create-merge-request-dropdown.create-merge-request-dropdown-menu.dropdown-menu.dropdown-menu-right.gl-show-field-errors{ class: ("create-confidential-merge-request-dropdown-menu" if can_create_confidential_merge_request?), data: { dropdown: true } }

app/views/projects/merge_requests/_mr_title.html.haml

@@ -25,9 +25,9 @@
 
   .detail-page-header-actions.js-issuable-actions
     .clearfix.issue-btn-group.dropdown
-      %button.btn.btn-default.float-left.d-md-none{ type: "button", data: { toggle: "dropdown" } }
+      %button.gl-button.btn.btn-default.float-left{ type: "button", data: { toggle: "dropdown" } }
         Options
-        = icon('caret-down')
+        = sprite_icon('chevron-down', css_class: 'gl-text-gray-500')
       .dropdown-menu.dropdown-menu-right
         %ul
           - if can_update_merge_request

changelogs/unreleased/225957-convert-to-svg-caret-down-projects.yml

@@ -0,0 +1,5 @@
+---
+title: Replace bootstrap caret-down with chevron-down
+merge_request: 48424
+author:
+type: other

locale/gitlab.pot

@@ -4387,12 +4387,18 @@ msgstr ""
 msgid "BillingPlan|Upgrade"
 msgstr ""
 
+msgid "Billing|An email address is only visible for users managed through Group Managed Accounts."
+msgstr ""
+
 msgid "Billing|An error occurred while loading billable members list"
 msgstr ""
 
 msgid "Billing|No users to display."
 msgstr ""
 
+msgid "Billing|Private"
+msgstr ""
+
 msgid "Billing|Updated live"
 msgstr ""
 

scripts/regenerate-schema

@@ -33,6 +33,7 @@ class SchemaRegenerator
       checkout_clean_schema
       hide_migrations
       remove_schema_migration_files
+      stop_spring
       reset_db
       unhide_migrations
       migrate
@@ -148,6 +149,12 @@ class SchemaRegenerator
     run(git_command).chomp.split("\n")
   end
 
+  ##
+  # Stop spring before modifying the database
+  def stop_spring
+    run %q[bin/spring stop]
+  end
+
   ##
   # Run rake task to reset the database.
   def reset_db

spec/frontend/repository/components/preview/__snapshots__/index_spec.js.snap

@@ -11,7 +11,6 @@ exports[`Repository file preview component renders file HTML 1`] = `
       class="file-header-content"
     >
       <gl-icon-stub
-        aria-hidden="true"
         name="doc-text"
         size="16"
       />

spec/frontend/sidebar/__snapshots__/confidential_issue_sidebar_spec.js.snap

@@ -10,7 +10,6 @@ exports[`Confidential Issue Sidebar Block renders for confidential = false and i
     title="Not confidential"
   >
     <gl-icon-stub
-      aria-hidden="true"
       name="eye"
       size="16"
     />
@@ -35,7 +34,6 @@ exports[`Confidential Issue Sidebar Block renders for confidential = false and i
       data-testid="not-confidential"
     >
       <gl-icon-stub
-        aria-hidden="true"
         class="sidebar-item-icon inline"
         name="eye"
         size="16"
@@ -58,7 +56,6 @@ exports[`Confidential Issue Sidebar Block renders for confidential = false and i
     title="Not confidential"
   >
     <gl-icon-stub
-      aria-hidden="true"
       name="eye"
       size="16"
     />
@@ -91,7 +88,6 @@ exports[`Confidential Issue Sidebar Block renders for confidential = false and i
       data-testid="not-confidential"
     >
       <gl-icon-stub
-        aria-hidden="true"
         class="sidebar-item-icon inline"
         name="eye"
         size="16"
@@ -114,7 +110,6 @@ exports[`Confidential Issue Sidebar Block renders for confidential = true and is
     title="Confidential"
   >
     <gl-icon-stub
-      aria-hidden="true"
       name="eye-slash"
       size="16"
     />
@@ -138,7 +133,6 @@ exports[`Confidential Issue Sidebar Block renders for confidential = true and is
       class="value sidebar-item-value hide-collapsed"
     >
       <gl-icon-stub
-        aria-hidden="true"
         class="sidebar-item-icon inline is-active"
         name="eye-slash"
         size="16"
@@ -161,7 +155,6 @@ exports[`Confidential Issue Sidebar Block renders for confidential = true and is
     title="Confidential"
   >
     <gl-icon-stub
-      aria-hidden="true"
       name="eye-slash"
       size="16"
     />
@@ -193,7 +186,6 @@ exports[`Confidential Issue Sidebar Block renders for confidential = true and is
       class="value sidebar-item-value hide-collapsed"
     >
       <gl-icon-stub
-        aria-hidden="true"
         class="sidebar-item-icon inline is-active"
         name="eye-slash"
         size="16"