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
90dc0928
Commit
90dc0928
authored
Mar 08, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes EE differences from environmnet_item
Creares a mixin & moves the EE template differences into CE
parent
a89df585
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
1 deletion
+32
-1
app/assets/javascripts/environments/components/environment_item.vue
.../javascripts/environments/components/environment_item.vue
+11
-1
app/assets/javascripts/environments/mixins/environment_item_mixin.js
...javascripts/environments/mixins/environment_item_mixin.js
+13
-0
changelogs/unreleased/10029-env-item.yml
changelogs/unreleased/10029-env-item.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/assets/javascripts/environments/components/environment_item.vue
View file @
90dc0928
...
@@ -4,6 +4,7 @@ import _ from 'underscore';
...
@@ -4,6 +4,7 @@ import _ from 'underscore';
import
{
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
UserAvatarLink
from
'
~/vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
UserAvatarLink
from
'
~/vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
environmentItemMixin
from
'
ee_else_ce/environments/mixins/environment_item_mixin
'
;
import
ActionsComponent
from
'
./environment_actions.vue
'
;
import
ActionsComponent
from
'
./environment_actions.vue
'
;
import
ExternalUrlComponent
from
'
./environment_external_url.vue
'
;
import
ExternalUrlComponent
from
'
./environment_external_url.vue
'
;
import
StopComponent
from
'
./environment_stop.vue
'
;
import
StopComponent
from
'
./environment_stop.vue
'
;
...
@@ -34,10 +35,10 @@ export default {
...
@@ -34,10 +35,10 @@ export default {
TerminalButtonComponent
,
TerminalButtonComponent
,
MonitoringButtonComponent
,
MonitoringButtonComponent
,
},
},
directives
:
{
directives
:
{
GlTooltip
:
GlTooltipDirective
,
GlTooltip
:
GlTooltipDirective
,
},
},
mixins
:
[
environmentItemMixin
],
props
:
{
props
:
{
model
:
{
model
:
{
...
@@ -467,9 +468,18 @@ export default {
...
@@ -467,9 +468,18 @@ export default {
<div
v-if=
"!model.isFolder"
class=
"table-mobile-header"
role=
"rowheader"
>
<div
v-if=
"!model.isFolder"
class=
"table-mobile-header"
role=
"rowheader"
>
{{
s__
(
'
Environments|Environment
'
)
}}
{{
s__
(
'
Environments|Environment
'
)
}}
</div>
</div>
<span
v-if=
"shouldRenderDeployBoard"
class=
"deploy-board-icon"
@
click=
"toggleDeployBoard"
>
<icon
:name=
"deployIconName"
/>
</span>
<span
v-if=
"!model.isFolder"
class=
"environment-name table-mobile-content"
>
<span
v-if=
"!model.isFolder"
class=
"environment-name table-mobile-content"
>
<a
class=
"qa-environment-link"
:href=
"environmentPath"
>
{{
model
.
name
}}
</a>
<a
class=
"qa-environment-link"
:href=
"environmentPath"
>
{{
model
.
name
}}
</a>
<span
v-if=
"isProtected"
class=
"badge badge-success"
>
{{
s__
(
'
Environments|protected
'
)
}}
</span>
</span>
</span>
<span
v-else
class=
"folder-name"
role=
"button"
@
click=
"onClickFolder"
>
<span
v-else
class=
"folder-name"
role=
"button"
@
click=
"onClickFolder"
>
<icon
:name=
"folderIconName"
class=
"folder-icon"
/>
<icon
:name=
"folderIconName"
class=
"folder-icon"
/>
...
...
app/assets/javascripts/environments/mixins/environment_item_mixin.js
0 → 100644
View file @
90dc0928
export
default
{
computed
:
{
deployIconName
()
{
return
''
;
},
shouldRenderDeployBoard
()
{
return
false
;
},
},
methods
:
{
toggleDeployBoard
()
{},
},
};
changelogs/unreleased/10029-env-item.yml
0 → 100644
View file @
90dc0928
---
title
:
Removes EE differences for environment_item.vue
merge_request
:
author
:
type
:
other
locale/gitlab.pot
View file @
90dc0928
...
@@ -3196,6 +3196,9 @@ msgstr ""
...
@@ -3196,6 +3196,9 @@ msgstr ""
msgid "Environments|You don't have any environments right now"
msgid "Environments|You don't have any environments right now"
msgstr ""
msgstr ""
msgid "Environments|protected"
msgstr ""
msgid "Epic"
msgid "Epic"
msgstr ""
msgstr ""
...
...
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