Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
489d669a
Commit
489d669a
authored
Jul 30, 2020
by
Andrew Fontaine
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'add-exportlabel' into 'master'
Replace deprecated button See merge request gitlab-org/gitlab!38189
parents
9b94d4e7
972aadda
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
11 deletions
+23
-11
ee/app/assets/javascripts/dependencies/components/dependencies_actions.vue
...ascripts/dependencies/components/dependencies_actions.vue
+6
-3
ee/changelogs/unreleased/add-exportlabel.yml
ee/changelogs/unreleased/add-exportlabel.yml
+5
-0
ee/spec/frontend/dependencies/components/__snapshots__/dependencies_actions_spec.js.snap
...omponents/__snapshots__/dependencies_actions_spec.js.snap
+9
-8
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
ee/app/assets/javascripts/dependencies/components/dependencies_actions.vue
View file @
489d669a
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
import
{
mapActions
,
mapState
}
from
'
vuex
'
;
import
{
mapActions
,
mapState
}
from
'
vuex
'
;
import
{
import
{
GlDeprecatedButton
,
GlDeprecatedButton
,
GlButton
,
GlDeprecatedDropdown
,
GlDeprecatedDropdown
,
GlDeprecatedDropdownItem
,
GlDeprecatedDropdownItem
,
GlIcon
,
GlIcon
,
...
@@ -14,6 +15,7 @@ export default {
...
@@ -14,6 +15,7 @@ export default {
name
:
'
DependenciesActions
'
,
name
:
'
DependenciesActions
'
,
components
:
{
components
:
{
GlDeprecatedButton
,
GlDeprecatedButton
,
GlButton
,
GlDeprecatedDropdown
,
GlDeprecatedDropdown
,
GlDeprecatedDropdownItem
,
GlDeprecatedDropdownItem
,
GlIcon
,
GlIcon
,
...
@@ -97,14 +99,15 @@ export default {
...
@@ -97,14 +99,15 @@ export default {
<gl-icon
:name=
"sortOrderIcon"
/>
<gl-icon
:name=
"sortOrderIcon"
/>
</gl-deprecated-button>
</gl-deprecated-button>
</div>
</div>
<gl-
deprecated-
button
<gl-button
v-gl-tooltip
v-gl-tooltip
:href=
"downloadEndpoint"
:href=
"downloadEndpoint"
download=
"dependencies.json"
download=
"dependencies.json"
:title=
"s__('Dependencies|Export as JSON')"
:title=
"s__('Dependencies|Export as JSON')"
class=
"js-download"
class=
"js-download"
icon=
"export"
>
>
<gl-icon
name=
"export"
/>
{{
__
(
'
Export
'
)
}}
</gl-
deprecated-
button>
</gl-button>
</div>
</div>
</
template
>
</
template
>
ee/changelogs/unreleased/add-exportlabel.yml
0 → 100644
View file @
489d669a
---
title
:
Add text to export button
merge_request
:
38189
author
:
type
:
other
ee/spec/frontend/dependencies/components/__snapshots__/dependencies_actions_spec.js.snap
View file @
489d669a
...
@@ -69,18 +69,19 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
...
@@ -69,18 +69,19 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
</gl-deprecated-button-stub>
</gl-deprecated-button-stub>
</div>
</div>
<gl-deprecated-button-stub
<gl-button-stub
category="tertiary"
class="js-download"
class="js-download"
download="dependencies.json"
download="dependencies.json"
href="http://test.host/dependencies.json"
href="http://test.host/dependencies.json"
size="md"
icon="export"
size="medium"
title="Export as JSON"
title="Export as JSON"
variant="
secondary
"
variant="
default
"
>
>
<gl-icon-stub
name="export"
Export
size="16"
/>
</gl-button-stub>
</gl-deprecated-button-stub>
</div>
</div>
`;
`;
locale/gitlab.pot
View file @
489d669a
...
@@ -9889,6 +9889,9 @@ msgstr ""
...
@@ -9889,6 +9889,9 @@ msgstr ""
msgid "Explore public groups"
msgid "Explore public groups"
msgstr ""
msgstr ""
msgid "Export"
msgstr ""
msgid "Export as CSV"
msgid "Export as CSV"
msgstr ""
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment