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
8926e4f2
Commit
8926e4f2
authored
Mar 12, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes EE differences for env app
parent
e4b2c3b0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
4 deletions
+47
-4
app/assets/javascripts/environments/components/environments_app.vue
.../javascripts/environments/components/environments_app.vue
+10
-4
app/assets/javascripts/environments/mixins/environments_app_mixin.js
...javascripts/environments/mixins/environments_app_mixin.js
+32
-0
spec/javascripts/environments/environments_app_spec.js
spec/javascripts/environments/environments_app_spec.js
+5
-0
No files found.
app/assets/javascripts/environments/components/environments_app.vue
View file @
8926e4f2
<
script
>
<
script
>
import
envrionmentsAppMixin
from
'
ee_else_ce/environments/mixins/environments_app_mixin
'
;
import
Flash
from
'
../../flash
'
;
import
Flash
from
'
../../flash
'
;
import
{
s__
}
from
'
../../locale
'
;
import
{
s__
}
from
'
../../locale
'
;
import
emptyState
from
'
./empty_state.vue
'
;
import
emptyState
from
'
./empty_state.vue
'
;
...
@@ -15,7 +16,7 @@ export default {
...
@@ -15,7 +16,7 @@ export default {
ConfirmRollbackModal
,
ConfirmRollbackModal
,
},
},
mixins
:
[
CIPaginationMixin
,
environmentsMixin
],
mixins
:
[
CIPaginationMixin
,
environmentsMixin
,
envrionmentsAppMixin
],
props
:
{
props
:
{
endpoint
:
{
endpoint
:
{
...
@@ -95,9 +96,9 @@ export default {
...
@@ -95,9 +96,9 @@ export default {
<tabs
:tabs=
"tabs"
scope=
"environments"
@
onChangeTab=
"onChangeTab"
/>
<tabs
:tabs=
"tabs"
scope=
"environments"
@
onChangeTab=
"onChangeTab"
/>
<div
v-if=
"canCreateEnvironment && !isLoading"
class=
"nav-controls"
>
<div
v-if=
"canCreateEnvironment && !isLoading"
class=
"nav-controls"
>
<a
:href=
"newEnvironmentPath"
class=
"btn btn-success"
>
{{
<a
:href=
"newEnvironmentPath"
class=
"btn btn-success"
>
s__
(
'
Environments|New environment
'
)
{{
s__
(
'
Environments|New environment
'
)
}}
}}
</a>
</a>
</div>
</div>
</div>
</div>
...
@@ -106,6 +107,11 @@ export default {
...
@@ -106,6 +107,11 @@ export default {
:environments=
"state.environments"
:environments=
"state.environments"
:pagination=
"state.paginationInformation"
:pagination=
"state.paginationInformation"
:can-read-environment=
"canReadEnvironment"
:can-read-environment=
"canReadEnvironment"
:canary-deployment-feature-id=
"canaryDeploymentFeatureId"
:show-canary-deployment-callout=
"showCanaryDeploymentCallout"
:user-callouts-path=
"userCalloutsPath"
:lock-promotion-svg-path=
"lockPromotionSvgPath"
:help-canary-deployments-path=
"helpCanaryDeploymentsPath"
@
onChangePage=
"onChangePage"
@
onChangePage=
"onChangePage"
>
>
<empty-state
<empty-state
...
...
app/assets/javascripts/environments/mixins/environments_app_mixin.js
0 → 100644
View file @
8926e4f2
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
:
''
,
},
},
metods
:
{
toggleDeployBoard
()
{},
},
};
spec/javascripts/environments/environments_app_spec.js
View file @
8926e4f2
...
@@ -13,6 +13,11 @@ describe('Environment', () => {
...
@@ -13,6 +13,11 @@ describe('Environment', () => {
cssContainerClass
:
'
container
'
,
cssContainerClass
:
'
container
'
,
newEnvironmentPath
:
'
environments/new
'
,
newEnvironmentPath
:
'
environments/new
'
,
helpPagePath
:
'
help
'
,
helpPagePath
:
'
help
'
,
canaryDeploymentFeatureId
:
'
canary_deployment
'
,
showCanaryDeploymentCallout
:
true
,
userCalloutsPath
:
'
/callouts
'
,
lockPromotionSvgPath
:
'
/assets/illustrations/lock-promotion.svg
'
,
helpCanaryDeploymentsPath
:
'
help/canary-deployments
'
,
};
};
let
EnvironmentsComponent
;
let
EnvironmentsComponent
;
...
...
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