Commit 489d669a authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'add-exportlabel' into 'master'

Replace deprecated button

See merge request gitlab-org/gitlab!38189
parents 9b94d4e7 972aadda
......@@ -2,6 +2,7 @@
import { mapActions, mapState } from 'vuex';
import {
GlDeprecatedButton,
GlButton,
GlDeprecatedDropdown,
GlDeprecatedDropdownItem,
GlIcon,
......@@ -14,6 +15,7 @@ export default {
name: 'DependenciesActions',
components: {
GlDeprecatedButton,
GlButton,
GlDeprecatedDropdown,
GlDeprecatedDropdownItem,
GlIcon,
......@@ -97,14 +99,15 @@ export default {
<gl-icon :name="sortOrderIcon" />
</gl-deprecated-button>
</div>
<gl-deprecated-button
<gl-button
v-gl-tooltip
:href="downloadEndpoint"
download="dependencies.json"
:title="s__('Dependencies|Export as JSON')"
class="js-download"
icon="export"
>
<gl-icon name="export" />
</gl-deprecated-button>
{{ __('Export') }}
</gl-button>
</div>
</template>
---
title: Add text to export button
merge_request: 38189
author:
type: other
......@@ -69,18 +69,19 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
</gl-deprecated-button-stub>
</div>
<gl-deprecated-button-stub
<gl-button-stub
category="tertiary"
class="js-download"
download="dependencies.json"
href="http://test.host/dependencies.json"
size="md"
icon="export"
size="medium"
title="Export as JSON"
variant="secondary"
variant="default"
>
<gl-icon-stub
name="export"
size="16"
/>
</gl-deprecated-button-stub>
Export
</gl-button-stub>
</div>
`;
......@@ -9889,6 +9889,9 @@ msgstr ""
msgid "Explore public groups"
msgstr ""
msgid "Export"
msgstr ""
msgid "Export as CSV"
msgstr ""
......
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