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
9d075f63
Commit
9d075f63
authored
Mar 12, 2019
by
Filipa Lacerda
Committed by
Phil Hughes
Mar 12, 2019
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
443de2a1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
59 additions
and
26 deletions
+59
-26
app/assets/javascripts/environments/components/container.vue
app/assets/javascripts/environments/components/container.vue
+6
-26
app/assets/javascripts/environments/mixins/container_mixin.js
...assets/javascripts/environments/mixins/container_mixin.js
+29
-0
ee/app/assets/javascripts/environments/mixins/container_mixin.js
...assets/javascripts/environments/mixins/container_mixin.js
+24
-0
No files found.
app/assets/javascripts/environments/components/container.vue
View file @
9d075f63
<
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
,
...
...
@@ -26,28 +28,6 @@ export default {
type
:
Boolean
,
required
:
true
,
},
// ee-only start
canaryDeploymentFeatureId
:
{
type
:
String
,
required
:
true
,
},
showCanaryDeploymentCallout
:
{
type
:
Boolean
,
required
:
true
,
},
userCalloutsPath
:
{
type
:
String
,
required
:
true
,
},
lockPromotionSvgPath
:
{
type
:
String
,
required
:
true
,
},
helpCanaryDeploymentsPath
:
{
type
:
String
,
required
:
true
,
},
// ee-only end
},
methods
:
{
onChangePage
(
page
)
{
...
...
app/assets/javascripts/environments/mixins/container_mixin.js
0 → 100644
View file @
9d075f63
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
,
},
},
};
ee/app/assets/javascripts/environments/mixins/container_mixin.js
0 → 100644
View file @
9d075f63
export
default
{
props
:
{
canaryDeploymentFeatureId
:
{
type
:
String
,
required
:
true
,
},
showCanaryDeploymentCallout
:
{
type
:
Boolean
,
required
:
true
,
},
userCalloutsPath
:
{
type
:
String
,
required
:
true
,
},
lockPromotionSvgPath
:
{
type
:
String
,
required
:
true
,
},
helpCanaryDeploymentsPath
:
{
type
:
String
,
required
:
true
,
},
},
};
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