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
f7c1db12
Commit
f7c1db12
authored
Aug 24, 2020
by
Marcel Amirault
Committed by
Enrique Alcántara
Aug 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to glbutton in manual job variables form
parent
e6c7726c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
12 deletions
+24
-12
app/assets/javascripts/jobs/components/manual_variables_form.vue
...ets/javascripts/jobs/components/manual_variables_form.vue
+14
-10
changelogs/unreleased/marcel-update-deprecated-button-5.yml
changelogs/unreleased/marcel-update-deprecated-button-5.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/frontend/jobs/components/manual_variables_form_spec.js
spec/frontend/jobs/components/manual_variables_form_spec.js
+2
-2
No files found.
app/assets/javascripts/jobs/components/manual_variables_form.vue
View file @
f7c1db12
<
script
>
import
{
uniqueId
}
from
'
lodash
'
;
import
{
mapActions
}
from
'
vuex
'
;
import
{
Gl
DeprecatedButton
,
GlIc
on
}
from
'
@gitlab/ui
'
;
import
{
Gl
Butt
on
}
from
'
@gitlab/ui
'
;
import
{
s__
,
sprintf
}
from
'
~/locale
'
;
export
default
{
name
:
'
ManualVariablesForm
'
,
components
:
{
GlDeprecatedButton
,
GlIcon
,
GlButton
,
},
props
:
{
action
:
{
...
...
@@ -136,12 +135,12 @@ export default {
<div
class=
"table-section section-10"
>
<div
class=
"table-mobile-header"
role=
"rowheader"
></div>
<div
class=
"table-mobile-content justify-content-end"
>
<gl-deprecated-button
class=
"btn-transparent btn-blank w-25"
<gl-button
category=
"tertiary"
icon=
"clear"
:aria-label=
"__('Delete variable')"
@
click=
"deleteVariable(variable.id)"
>
<gl-icon
name=
"clear"
/>
</gl-deprecated-button>
/>
</div>
</div>
</div>
...
...
@@ -175,9 +174,14 @@ export default {
<p
class=
"text-muted"
v-html=
"helpText"
></p>
</div>
<div
class=
"d-flex justify-content-center"
>
<gl-deprecated-button
variant=
"primary"
@
click=
"triggerManualJob(variables)"
>
<gl-button
variant=
"info"
category=
"primary"
:aria-label=
"__('Trigger manual job')"
@
click=
"triggerManualJob(variables)"
>
{{
action
.
button_title
}}
</gl-
deprecated-
button>
</gl-button>
</div>
</div>
</
template
>
changelogs/unreleased/marcel-update-deprecated-button-5.yml
0 → 100644
View file @
f7c1db12
---
title
:
Update spec to glbutton
merge_request
:
39311
author
:
type
:
other
locale/gitlab.pot
View file @
f7c1db12
...
...
@@ -26049,6 +26049,9 @@ msgstr ""
msgid "Trigger cluster reindexing"
msgstr ""
msgid "Trigger manual job"
msgstr ""
msgid "Trigger pipelines for mirror updates"
msgstr ""
...
...
spec/frontend/jobs/components/manual_variables_form_spec.js
View file @
f7c1db12
import
{
shallowMount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
Form
from
'
~/jobs/components/manual_variables_form.vue
'
;
const
localVue
=
createLocalVue
();
...
...
@@ -95,7 +95,7 @@ describe('Manual Variables Form', () => {
});
it
(
'
removes the variable row
'
,
()
=>
{
wrapper
.
find
(
Gl
Deprecated
Button
).
vm
.
$emit
(
'
click
'
);
wrapper
.
find
(
GlButton
).
vm
.
$emit
(
'
click
'
);
expect
(
wrapper
.
vm
.
variables
.
length
).
toBe
(
0
);
});
...
...
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