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
64764dc9
Commit
64764dc9
authored
Sep 03, 2020
by
Austin Regnery
Committed by
Nathan Friend
Sep 03, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace <gl-deprecated-button> with <gl-button> in strategy.vue
parent
bb1405a1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
17 deletions
+7
-17
ee/app/assets/javascripts/feature_flags/components/strategy.vue
.../assets/javascripts/feature_flags/components/strategy.vue
+5
-12
ee/spec/frontend/feature_flags/components/strategy_spec.js
ee/spec/frontend/feature_flags/components/strategy_spec.js
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+0
-3
No files found.
ee/app/assets/javascripts/feature_flags/components/strategy.vue
View file @
64764dc9
...
...
@@ -7,8 +7,7 @@ import {
GlFormTextarea
,
GlFormGroup
,
GlToken
,
GlDeprecatedButton
,
GlIcon
,
GlButton
,
}
from
'
@gitlab/ui
'
;
import
{
s__
,
__
}
from
'
~/locale
'
;
import
{
...
...
@@ -28,8 +27,7 @@ export default {
GlFormTextarea
,
GlFormSelect
,
GlToken
,
GlDeprecatedButton
,
GlIcon
,
GlButton
,
NewEnvironmentsDropdown
,
},
model
:
{
...
...
@@ -64,7 +62,6 @@ export default {
translations
:
{
allEnvironments
:
__
(
'
All environments
'
),
environmentsLabel
:
__
(
'
Environments
'
),
removeLabel
:
s__
(
'
FeatureFlag|Delete strategy
'
),
rolloutPercentageDescription
:
__
(
'
Enter a whole number between 0 and 100
'
),
rolloutPercentageInvalid
:
s__
(
'
FeatureFlags|Percent rollout must be a whole number between 0 and 100
'
,
...
...
@@ -269,16 +266,12 @@ export default {
</div>
<div
class=
"align-self-end align-self-md-stretch order-first offset-md-0 order-md-0 ml-auto"
>
<gl-
deprecated-
button
<gl-button
data-testid=
"delete-strategy-button"
variant=
"danger"
icon=
"remove"
@
click=
"$emit('delete')"
>
<span
class=
"d-md-none"
>
{{
$options
.
translations
.
removeLabel
}}
</span>
<gl-icon
class=
"d-none d-md-inline-flex"
name=
"remove"
/>
</gl-deprecated-button>
/>
</div>
</div>
<div
class=
"flex flex-column"
>
...
...
ee/spec/frontend/feature_flags/components/strategy_spec.js
View file @
64764dc9
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
GlFormSelect
,
GlFormTextarea
,
GlFormInput
,
GlToken
,
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlFormSelect
,
GlFormTextarea
,
GlFormInput
,
GlToken
,
GlButton
}
from
'
@gitlab/ui
'
;
import
{
PERCENT_ROLLOUT_GROUP_ID
,
ROLLOUT_STRATEGY_ALL_USERS
,
...
...
@@ -204,7 +204,7 @@ describe('Feature flags strategy', () => {
});
it
(
'
should emit a delete if the delete button is clicked
'
,
()
=>
{
wrapper
.
find
(
Gl
Deprecated
Button
).
vm
.
$emit
(
'
click
'
);
wrapper
.
find
(
GlButton
).
vm
.
$emit
(
'
click
'
);
expect
(
wrapper
.
emitted
(
'
delete
'
)).
toEqual
([[]]);
});
});
...
...
locale/gitlab.pot
View file @
64764dc9
...
...
@@ -10639,9 +10639,6 @@ msgstr ""
msgid "FeatureFlags|User List"
msgstr ""
msgid "FeatureFlag|Delete strategy"
msgstr ""
msgid "FeatureFlag|List"
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