Merge branch 'gitlab-ui-integration-883-upgrade-bootstrap-vue-2.15.0' into 'master'

Upgrade @gitlab/ui to v29.8.1

See merge request gitlab-org/gitlab!59501

app/assets/javascripts/members/components/table/members_table.vue

@@ -134,6 +134,9 @@ export default {
       show-empty
       :tbody-tr-attr="tbodyTrAttr"
     >
+      <template #head()="{ label }">
+        {{ label }}
+      </template>
       <template #cell(account)="{ item: member }">
         <members-table-cell #default="{ memberType, isCurrentUser }" :member="member">
           <member-avatar

changelogs/unreleased/gitlab-ui-integration-883-upgrade-bootstrap-vue-2-15-0.yml

+---
+title: Upgrade Bootstrap to v4.5.3
+merge_request: 59501
+author:
+type: other

ee/spec/frontend/analytics/code_review_analytics/components/__snapshots__/merge_request_table_spec.js.snap

@@ -26,7 +26,9 @@ exports[`MergeRequestTable component template matches the snapshot 1`] = `
         role="columnheader"
         scope="col"
       >
-        Merge Request
+        <div>
+          Merge Request
+        </div>
       </th>
       <th
         aria-colindex="2"
@@ -34,7 +36,9 @@ exports[`MergeRequestTable component template matches the snapshot 1`] = `
         role="columnheader"
         scope="col"
       >
-        Review time
+        <div>
+          Review time
+        </div>
       </th>
       <th
         aria-colindex="3"
@@ -42,7 +46,9 @@ exports[`MergeRequestTable component template matches the snapshot 1`] = `
         role="columnheader"
         scope="col"
       >
-        Author
+        <div>
+          Author
+        </div>
       </th>
       <th
         aria-colindex="4"
@@ -50,7 +56,9 @@ exports[`MergeRequestTable component template matches the snapshot 1`] = `
         role="columnheader"
         scope="col"
       >
-        Approvers
+        <div>
+          Approvers
+        </div>
       </th>
       <th
         aria-colindex="5"
@@ -58,7 +66,9 @@ exports[`MergeRequestTable component template matches the snapshot 1`] = `
         role="columnheader"
         scope="col"
       >
-        Comments
+        <div>
+          Comments
+        </div>
       </th>
       <th
         aria-colindex="6"
@@ -66,7 +76,9 @@ exports[`MergeRequestTable component template matches the snapshot 1`] = `
         role="columnheader"
         scope="col"
       >
-        Commits
+        <div>
+          Commits
+        </div>
       </th>
       <th
         aria-colindex="7"
@@ -74,7 +86,9 @@ exports[`MergeRequestTable component template matches the snapshot 1`] = `
         role="columnheader"
         scope="col"
       >
-        Line changes
+        <div>
+          Line changes
+        </div>
       </th>
     </tr>
   </thead>

ee/spec/frontend/security_configuration/corpus_management/__snapshots__/corpus_table_spec.js.snap

@@ -11,7 +11,9 @@ exports[`Corpus table corpus management renders with the correct columns 1`] = `
     role="columnheader"
     scope="col"
   >
-    Corpus name
+    <div>
+      Corpus name
+    </div>
   </th>
   <th
     aria-colindex="2"
@@ -19,7 +21,9 @@ exports[`Corpus table corpus management renders with the correct columns 1`] = `
     role="columnheader"
     scope="col"
   >
-    Target
+    <div>
+      Target
+    </div>
   </th>
   <th
     aria-colindex="3"
@@ -27,7 +31,9 @@ exports[`Corpus table corpus management renders with the correct columns 1`] = `
     role="columnheader"
     scope="col"
   >
-    Last updated
+    <div>
+      Last updated
+    </div>
   </th>
   <th
     aria-colindex="4"
@@ -35,7 +41,9 @@ exports[`Corpus table corpus management renders with the correct columns 1`] = `
     role="columnheader"
     scope="col"
   >
-    Last used
+    <div>
+      Last used
+    </div>
   </th>
   <th
     aria-colindex="5"
@@ -43,7 +51,9 @@ exports[`Corpus table corpus management renders with the correct columns 1`] = `
     role="columnheader"
     scope="col"
   >
-    Actions
+    <div>
+      Actions
+    </div>
   </th>
 </tr>
 `;

ee/spec/frontend/threat_monitoring/components/__snapshots__/network_policy_list_spec.js.snap

@@ -29,7 +29,9 @@ exports[`NetworkPolicyList component renders policies table 1`] = `
         role="columnheader"
         scope="col"
       >
-        Name
+        <div>
+          Name
+        </div>
       </th>
       <th
         aria-colindex="2"
@@ -37,7 +39,9 @@ exports[`NetworkPolicyList component renders policies table 1`] = `
         role="columnheader"
         scope="col"
       >
-        Status
+        <div>
+          Status
+        </div>
       </th>
       <th
         aria-colindex="3"
@@ -45,7 +49,9 @@ exports[`NetworkPolicyList component renders policies table 1`] = `
         role="columnheader"
         scope="col"
       >
-        Last modified
+        <div>
+          Last modified
+        </div>
       </th>
     </tr>
   </thead>

package.json

@@ -51,7 +51,7 @@
     "@gitlab/favicon-overlay": "2.0.0",
     "@gitlab/svgs": "1.189.0",
     "@gitlab/tributejs": "1.0.0",
-    "@gitlab/ui": "29.7.3",
+    "@gitlab/ui": "29.8.1",
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "^6.0.3-4",
     "@rails/ujs": "^6.0.3-4",
@@ -70,7 +70,7 @@
     "axios": "^0.20.0",
     "babel-loader": "^8.2.2",
     "babel-plugin-lodash": "^3.3.4",
-    "bootstrap": "4.4.1",
+    "bootstrap": "4.5.3",
     "cache-loader": "^4.1.0",
     "clipboard": "^1.7.1",
     "codemirror": "^5.48.4",

spec/frontend/content_editor/components/__snapshots__/toolbar_button_spec.js.snap

 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`content_editor/components/toolbar_button displays tertiary, small button with a provided label and icon 1`] = `
-"<b-button-stub event=\\"click\\" routertag=\\"a\\" size=\\"sm\\" variant=\\"default\\" type=\\"button\\" tag=\\"button\\" aria-label=\\"Bold\\" title=\\"Bold\\" class=\\"gl-mx-2 gl-button btn-default-tertiary btn-icon\\">
+"<b-button-stub size=\\"sm\\" variant=\\"default\\" type=\\"button\\" tag=\\"button\\" aria-label=\\"Bold\\" title=\\"Bold\\" class=\\"gl-mx-2 gl-button btn-default-tertiary btn-icon\\">
   <!---->
   <gl-icon-stub name=\\"bold\\" size=\\"16\\" class=\\"gl-button-icon\\"></gl-icon-stub>
   <!---->

spec/frontend/jira_import/components/__snapshots__/jira_import_form_spec.js.snap

@@ -24,7 +24,9 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] =
         role="columnheader"
         scope="col"
       >
-        Jira display name
+        <div>
+          Jira display name
+        </div>
       </th>
       <th
         aria-colindex="2"
@@ -32,14 +34,18 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] =
         class=""
         role="columnheader"
         scope="col"
-      />
+      >
+        <div />
+      </th>
       <th
         aria-colindex="3"
         class=""
         role="columnheader"
         scope="col"
       >
-        GitLab username
+        <div>
+          GitLab username
+        </div>
       </th>
     </tr>
   </thead>

yarn.lock

@@ -907,14 +907,14 @@
   resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
   integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
 
-"@gitlab/ui@29.7.3":
-  version "29.7.3"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.7.3.tgz#f7762cc6a20fc8f1c6403822f8cbef821f2438dd"
-  integrity sha512-2pU7t+kFB4ndq3ZW8PzZ26LEj+vAd8AaJLvBmBDba1hEx5KlH4B9U30lGl+UYzgjY3yoe68eObK26vJjJ1rb0g==
+"@gitlab/ui@29.8.1":
+  version "29.8.1"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.8.1.tgz#9bac442e0579e7eb5610a3e08c481bb272514559"
+  integrity sha512-Pn1n4K2MR42YoQI+8i9Hs5ljtb2TQWhx1ectEsft/xMLS8TTm8okM553sM9Z7kf1coizFKILQOmz+E5RwcnOsQ==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.3.0"
-    bootstrap-vue "2.14.0"
+    bootstrap-vue "2.15.0"
     copy-to-clipboard "^3.0.8"
     dompurify "^2.2.7"
     echarts "^4.9.0"
@@ -2480,21 +2480,21 @@ bonjour@^3.5.0:
     multicast-dns "^6.0.1"
     multicast-dns-service-types "^1.1.0"
 
-bootstrap-vue@2.14.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.14.0.tgz#de88b607627431980b707e6f069f13ef8cc897bd"
-  integrity sha512-sqbS7iHYCZEj/dDx4Yaze99HcX6bZjO4bSWZ0xSgJwtWQlbfB2VDJ9Qjzjp9XI8TT32wYNGAMpnXpYjQvv5qyQ==
+bootstrap-vue@2.15.0:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.15.0.tgz#0dfc12c054496c0f10efed510da1def41697cf3c"
+  integrity sha512-ncxWkDG0mKFVot314wWKJELi+ESO7k6ngV//qvJFs9iVzlFI8Hx3rBVbpcPW2vrJ+0vitH8N2SOwn4fdQ3frMQ==
   dependencies:
     "@nuxt/opencollective" "^0.3.0"
-    bootstrap ">=4.4.1 <5.0.0"
+    bootstrap ">=4.5.0 <5.0.0"
     popper.js "^1.16.1"
     portal-vue "^2.1.7"
     vue-functional-data-merge "^3.1.0"
 
-bootstrap@4.4.1, "bootstrap@>=4.4.1 <5.0.0":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz#8582960eea0c5cd2bede84d8b0baf3789c3e8b01"
-  integrity sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==
+bootstrap@4.5.3, "bootstrap@>=4.5.0 <5.0.0":
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6"
+  integrity sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ==
 
 boxen@^4.2.0:
   version "4.2.0"