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
ea86d8f4
Commit
ea86d8f4
authored
Apr 21, 2020
by
Emily Ring
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved environment_item_mixin out of ee folder
parent
22ef029a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
32 deletions
+11
-32
app/assets/javascripts/environments/components/environment_item.vue
.../javascripts/environments/components/environment_item.vue
+11
-2
app/assets/javascripts/environments/mixins/environment_item_mixin.js
...javascripts/environments/mixins/environment_item_mixin.js
+0
-13
ee/app/assets/javascripts/environments/mixins/environment_item_mixin.js
...javascripts/environments/mixins/environment_item_mixin.js
+0
-17
No files found.
app/assets/javascripts/environments/components/environment_item.vue
View file @
ea86d8f4
...
...
@@ -9,7 +9,6 @@ import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link
import
CommitComponent
from
'
~/vue_shared/components/commit.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
TooltipOnTruncate
from
'
~/vue_shared/components/tooltip_on_truncate.vue
'
;
import
environmentItemMixin
from
'
ee_else_ce/environments/mixins/environment_item_mixin
'
;
import
eventHub
from
'
../event_hub
'
;
import
ActionsComponent
from
'
./environment_actions.vue
'
;
import
ExternalUrlComponent
from
'
./environment_external_url.vue
'
;
...
...
@@ -44,7 +43,7 @@ export default {
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
mixins
:
[
environmentItemMixin
,
timeagoMixin
],
mixins
:
[
timeagoMixin
],
props
:
{
canReadEnvironment
:
{
...
...
@@ -65,6 +64,9 @@ export default {
},
computed
:
{
deployIconName
()
{
return
this
.
model
.
isDeployBoardVisible
?
'
chevron-down
'
:
'
chevron-right
'
;
},
/**
* Verifies if `last_deployment` key exists in the current Environment.
* This key is required to render most of the html - this method works has
...
...
@@ -210,6 +212,10 @@ export default {
}));
},
shouldRenderDeployBoard
()
{
return
this
.
model
.
hasDeployBoard
;
},
/**
* Builds the string used in the user image alt attribute.
*
...
...
@@ -501,6 +507,9 @@ export default {
},
methods
:
{
toggleDeployBoard
()
{
eventHub
.
$emit
(
'
toggleDeployBoard
'
,
this
.
model
);
},
onClickFolder
()
{
eventHub
.
$emit
(
'
toggleFolder
'
,
this
.
model
);
},
...
...
app/assets/javascripts/environments/mixins/environment_item_mixin.js
deleted
100644 → 0
View file @
22ef029a
export
default
{
computed
:
{
deployIconName
()
{
return
''
;
},
shouldRenderDeployBoard
()
{
return
false
;
},
},
methods
:
{
toggleDeployBoard
()
{},
},
};
ee/app/assets/javascripts/environments/mixins/environment_item_mixin.js
deleted
100644 → 0
View file @
22ef029a
import
eventHub
from
'
~/environments/event_hub
'
;
export
default
{
computed
:
{
deployIconName
()
{
return
this
.
model
.
isDeployBoardVisible
?
'
chevron-down
'
:
'
chevron-right
'
;
},
shouldRenderDeployBoard
()
{
return
this
.
model
.
hasDeployBoard
;
},
},
methods
:
{
toggleDeployBoard
()
{
eventHub
.
$emit
(
'
toggleDeployBoard
'
,
this
.
model
);
},
},
};
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