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
78f246a9
Commit
78f246a9
authored
Mar 11, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes ee differences for container.vue
Creates a mixin to include the ee only properties
parent
a89df585
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
5 deletions
+44
-5
app/assets/javascripts/environments/components/container.vue
app/assets/javascripts/environments/components/container.vue
+15
-5
app/assets/javascripts/environments/mixins/container_mixin.js
...assets/javascripts/environments/mixins/container_mixin.js
+29
-0
No files found.
app/assets/javascripts/environments/components/container.vue
View file @
78f246a9
<
script
>
import
{
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
tablePagination
from
'
../../vue_shared/components/table_pagination.vue
'
;
import
environmentTable
from
'
../components/environments_table.vue
'
;
import
TablePagination
from
'
~/vue_shared/components/table_pagination.vue
'
;
import
containerMixin
from
'
ee_else_ce/environments/mixins/container_mixin
'
;
import
EnvironmentTable
from
'
../components/environments_table.vue
'
;
export
default
{
components
:
{
e
nvironmentTable
,
t
ablePagination
,
E
nvironmentTable
,
T
ablePagination
,
GlLoadingIcon
,
},
mixins
:
[
containerMixin
],
props
:
{
isLoading
:
{
type
:
Boolean
,
...
...
@@ -47,7 +49,15 @@ export default {
<slot
name=
"emptyState"
></slot>
<div
v-if=
"!isLoading && environments.length > 0"
class=
"table-holder"
>
<environment-table
:environments=
"environments"
:can-read-environment=
"canReadEnvironment"
/>
<environment-table
:environments=
"environments"
:can-read-environment=
"canReadEnvironment"
:canary-deployment-feature-id=
"canaryDeploymentFeatureId"
:show-canary-deployment-callout=
"showCanaryDeploymentCallout"
:user-callouts-path=
"userCalloutsPath"
:lock-promotion-svg-path=
"lockPromotionSvgPath"
:help-canary-deployments-path=
"helpCanaryDeploymentsPath"
/>
<table-pagination
v-if=
"pagination && pagination.totalPages > 1"
...
...
app/assets/javascripts/environments/mixins/container_mixin.js
0 → 100644
View file @
78f246a9
export
default
{
props
:
{
canaryDeploymentFeatureId
:
{
type
:
String
,
required
:
false
,
default
:
null
,
},
showCanaryDeploymentCallout
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
userCalloutsPath
:
{
type
:
String
,
required
:
false
,
default
:
null
,
},
lockPromotionSvgPath
:
{
type
:
String
,
required
:
false
,
default
:
null
,
},
helpCanaryDeploymentsPath
:
{
type
:
String
,
required
:
false
,
default
:
null
,
},
},
};
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