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
7af9b6ae
Commit
7af9b6ae
authored
Apr 07, 2020
by
Sarah GP
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove feature flag refs in Vue
parent
867839bb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
17 deletions
+4
-17
app/assets/javascripts/environments/components/environment_item.vue
.../javascripts/environments/components/environment_item.vue
+2
-8
app/assets/javascripts/environments/components/environments_table.vue
...avascripts/environments/components/environments_table.vue
+2
-9
No files found.
app/assets/javascripts/environments/components/environment_item.vue
View file @
7af9b6ae
...
...
@@ -58,12 +58,6 @@ export default {
required
:
true
,
},
shouldShowAutoStopDate
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
tableData
:
{
type
:
Object
,
required
:
true
,
...
...
@@ -639,7 +633,7 @@ export default {
</div>
<div
v-if=
"!isFolder
&& shouldShowAutoStopDate
"
v-if=
"!isFolder"
class=
"table-section"
:class=
"tableData.autoStop.spacing"
role=
"gridcell"
...
...
@@ -663,7 +657,7 @@ export default {
>
<div
class=
"btn-group table-action-buttons"
role=
"group"
>
<pin-component
v-if=
"canShowAutoStopDate
&& shouldShowAutoStopDate
"
v-if=
"canShowAutoStopDate"
:auto-stop-url=
"autoStopUrl"
/>
...
...
app/assets/javascripts/environments/components/environments_table.vue
View file @
7af9b6ae
...
...
@@ -6,7 +6,6 @@ import { GlLoadingIcon } from '@gitlab/ui';
import
{
flow
,
reverse
,
sortBy
}
from
'
lodash/fp
'
;
import
environmentTableMixin
from
'
ee_else_ce/environments/mixins/environments_table_mixin
'
;
import
{
s__
}
from
'
~/locale
'
;
import
glFeatureFlagsMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
EnvironmentItem
from
'
./environment_item.vue
'
;
export
default
{
...
...
@@ -17,7 +16,7 @@ export default {
CanaryDeploymentCallout
:
()
=>
import
(
'
ee_component/environments/components/canary_deployment_callout.vue
'
),
},
mixins
:
[
environmentTableMixin
,
glFeatureFlagsMixin
()
],
mixins
:
[
environmentTableMixin
],
props
:
{
environments
:
{
type
:
Array
,
...
...
@@ -43,9 +42,6 @@ export default {
:
env
,
);
},
shouldShowAutoStopDate
()
{
return
this
.
glFeatures
.
autoStopEnvironments
;
},
tableData
()
{
return
{
// percent spacing for cols, should add up to 100
...
...
@@ -74,7 +70,7 @@ export default {
spacing
:
'
section-5
'
,
},
actions
:
{
spacing
:
this
.
shouldShowAutoStopDate
?
'
section-25
'
:
'
section-30
'
,
spacing
:
'
section-25
'
,
},
};
},
...
...
@@ -132,7 +128,6 @@ export default {
{{
tableData
.
date
.
title
}}
</div>
<div
v-if=
"shouldShowAutoStopDate"
class=
"table-section"
:class=
"tableData.autoStop.spacing"
role=
"columnheader"
...
...
@@ -146,7 +141,6 @@ export default {
:key=
"`environment-item-$
{i}`"
:model="model"
:can-read-environment="canReadEnvironment"
:should-show-auto-stop-date="shouldShowAutoStopDate"
:table-data="tableData"
/>
...
...
@@ -180,7 +174,6 @@ export default {
:model="children"
:can-read-environment="canReadEnvironment"
:table-data="tableData"
:should-show-auto-stop-date="shouldShowAutoStopDate"
/>
<div
:key=
"`sub-div-$
{i}`">
...
...
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