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
1c4fee81
Commit
1c4fee81
authored
Apr 28, 2020
by
Emily Ring
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Combine environments_folder_mixin with component
parent
f1262ebd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
31 deletions
+26
-31
app/assets/javascripts/environments/folder/environments_folder_view.vue
...ascripts/environments/folder/environments_folder_view.vue
+26
-2
app/assets/javascripts/environments/mixins/environments_folder_view_mixin.js
...pts/environments/mixins/environments_folder_view_mixin.js
+0
-29
No files found.
app/assets/javascripts/environments/folder/environments_folder_view.vue
View file @
1c4fee81
<
script
>
import
folderMixin
from
'
../mixins/environments_folder_view_mixin
'
;
import
environmentsMixin
from
'
../mixins/environments_mixin
'
;
import
CIPaginationMixin
from
'
../../vue_shared/mixins/ci_pagination_api_mixin
'
;
import
StopEnvironmentModal
from
'
../components/stop_environment_modal.vue
'
;
...
...
@@ -11,7 +10,7 @@ export default {
DeleteEnvironmentModal
,
},
mixins
:
[
environmentsMixin
,
CIPaginationMixin
,
folderMixin
],
mixins
:
[
environmentsMixin
,
CIPaginationMixin
],
props
:
{
endpoint
:
{
...
...
@@ -30,6 +29,31 @@ export default {
type
:
Boolean
,
required
:
true
,
},
canaryDeploymentFeatureId
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
showCanaryDeploymentCallout
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
userCalloutsPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
lockPromotionSvgPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
helpCanaryDeploymentsPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
methods
:
{
successCallback
(
resp
)
{
...
...
app/assets/javascripts/environments/mixins/environments_folder_view_mixin.js
deleted
100644 → 0
View file @
f1262ebd
export
default
{
props
:
{
canaryDeploymentFeatureId
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
showCanaryDeploymentCallout
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
userCalloutsPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
lockPromotionSvgPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
helpCanaryDeploymentsPath
:
{
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