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
93965a24
Commit
93965a24
authored
Apr 23, 2020
by
Emily Ring
Committed by
Paul Slaughter
Apr 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved container_mixin out of ee folder
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30061
parent
d12e63eb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
65 deletions
+30
-65
app/assets/javascripts/environments/components/container.vue
app/assets/javascripts/environments/components/container.vue
+30
-2
app/assets/javascripts/environments/mixins/container_mixin.js
...assets/javascripts/environments/mixins/container_mixin.js
+0
-34
ee/app/assets/javascripts/environments/mixins/container_mixin.js
...assets/javascripts/environments/mixins/container_mixin.js
+0
-29
No files found.
app/assets/javascripts/environments/components/container.vue
View file @
93965a24
<
script
>
<
script
>
import
{
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
containerMixin
from
'
ee_else_ce/environments/mixins/container_mixin
'
;
import
TablePagination
from
'
~/vue_shared/components/pagination/table_pagination.vue
'
;
import
TablePagination
from
'
~/vue_shared/components/pagination/table_pagination.vue
'
;
import
EnvironmentTable
from
'
../components/environments_table.vue
'
;
import
EnvironmentTable
from
'
../components/environments_table.vue
'
;
...
@@ -10,8 +9,12 @@ export default {
...
@@ -10,8 +9,12 @@ export default {
TablePagination
,
TablePagination
,
GlLoadingIcon
,
GlLoadingIcon
,
},
},
mixins
:
[
containerMixin
],
props
:
{
props
:
{
canaryDeploymentFeatureId
:
{
type
:
String
,
required
:
false
,
default
:
null
,
},
isLoading
:
{
isLoading
:
{
type
:
Boolean
,
type
:
Boolean
,
required
:
true
,
required
:
true
,
...
@@ -28,6 +31,31 @@ export default {
...
@@ -28,6 +31,31 @@ export default {
type
:
Boolean
,
type
:
Boolean
,
required
:
true
,
required
:
true
,
},
},
deployBoardsHelpPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
helpCanaryDeploymentsPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
lockPromotionSvgPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
showCanaryDeploymentCallout
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
userCalloutsPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
},
methods
:
{
methods
:
{
onChangePage
(
page
)
{
onChangePage
(
page
)
{
...
...
app/assets/javascripts/environments/mixins/container_mixin.js
deleted
100644 → 0
View file @
d12e63eb
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
,
},
deployBoardsHelpPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
};
ee/app/assets/javascripts/environments/mixins/container_mixin.js
deleted
100644 → 0
View file @
d12e63eb
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
,
},
deployBoardsHelpPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
};
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