Commit 9163c26d authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'gitlab-ui-integration-nfriend-add-url-aware-tab-control' into 'master'

Upgrade @gitlab/ui to v29.37.0

See merge request gitlab-org/gitlab!61951
parents f76b3b43 20f6d946
...@@ -169,6 +169,12 @@ export default { ...@@ -169,6 +169,12 @@ export default {
methods: { methods: {
filterItemsByStatus(tabIndex) { filterItemsByStatus(tabIndex) {
this.resetPagination(); this.resetPagination();
const activeStatusTab = this.statusTabs[tabIndex];
if (activeStatusTab == null) {
return;
}
const { filters, status } = this.statusTabs[tabIndex]; const { filters, status } = this.statusTabs[tabIndex];
this.statusFilter = filters; this.statusFilter = filters;
this.filteredByStatus = status; this.filteredByStatus = status;
......
...@@ -25,7 +25,9 @@ exports[`ComplianceDashboard component when there are merge requests and the sho ...@@ -25,7 +25,9 @@ exports[`ComplianceDashboard component when there are merge requests and the sho
</header> </header>
<gl-tabs-stub <gl-tabs-stub
queryparamname="tab"
theme="indigo" theme="indigo"
value="0"
> >
<b-tab-stub <b-tab-stub
tag="div" tag="div"
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
exports[`PolicyPreview component with policy description renders policy preview tabs 1`] = ` exports[`PolicyPreview component with policy description renders policy preview tabs 1`] = `
<gl-tabs-stub <gl-tabs-stub
contentclass="gl-pt-0" contentclass="gl-pt-0"
queryparamname="tab"
theme="indigo" theme="indigo"
value="0" value="0"
> >
......
...@@ -16,6 +16,7 @@ exports[`AddContextCommitsModal renders modal with 2 tabs 1`] = ` ...@@ -16,6 +16,7 @@ exports[`AddContextCommitsModal renders modal with 2 tabs 1`] = `
> >
<gl-tabs-stub <gl-tabs-stub
contentclass="pt-0" contentclass="pt-0"
queryparamname="tab"
theme="indigo" theme="indigo"
value="0" value="0"
> >
......
...@@ -13,7 +13,9 @@ exports[`Code navigation popover component renders popover 1`] = ` ...@@ -13,7 +13,9 @@ exports[`Code navigation popover component renders popover 1`] = `
<gl-tabs-stub <gl-tabs-stub
contentclass="gl-py-0" contentclass="gl-py-0"
navclass="gl-hidden" navclass="gl-hidden"
queryparamname="tab"
theme="indigo" theme="indigo"
value="0"
> >
<gl-tab-stub <gl-tab-stub
title="Definition" title="Definition"
......
...@@ -39,7 +39,9 @@ exports[`IncidentsSettingTabs should render the component 1`] = ` ...@@ -39,7 +39,9 @@ exports[`IncidentsSettingTabs should render the component 1`] = `
class="settings-content" class="settings-content"
> >
<gl-tabs-stub <gl-tabs-stub
queryparamname="tab"
theme="indigo" theme="indigo"
value="0"
> >
<!----> <!---->
......
...@@ -908,10 +908,10 @@ ...@@ -908,10 +908,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8" resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw== integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
"@gitlab/ui@29.36.0": "@gitlab/ui@29.37.0":
version "29.36.0" version "29.37.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.36.0.tgz#a418c34c7ef768552b551807fa2a65deeaeba0bf" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.37.0.tgz#ddfd4760562387f7c164756301f73e29c1a5cd13"
integrity sha512-ZsaYpbp5cFN9hxVCf19E7avS9AmMaAyS4/Zwkwu2reHJUOkwyOY24eLr44u/Kbaq6SkFarQ2y+zU8vuhzXwQjQ== integrity sha512-DK+MRhCeAXs7RhbIq7k7z+jTvSoQFfziMgFidmFiyyLYsZRj0+ya2pF9SubxEzH9HKwhs2TNZFd28onO8i5upg==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.3.0" "@gitlab/vue-toasted" "^1.3.0"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment