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
a8b2fb45
Commit
a8b2fb45
authored
Jun 18, 2019
by
Enrique Alcantara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FE: Pass deploy board help path from HAML
Generate deploy board help path using RoR link generator utilities.
parent
6ca447f5
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
32 additions
and
4 deletions
+32
-4
app/assets/javascripts/environments/components/container.vue
app/assets/javascripts/environments/components/container.vue
+1
-0
app/assets/javascripts/environments/components/environments_app.vue
.../javascripts/environments/components/environments_app.vue
+6
-0
app/assets/javascripts/environments/components/environments_table.vue
...avascripts/environments/components/environments_table.vue
+6
-0
app/assets/javascripts/environments/index.js
app/assets/javascripts/environments/index.js
+2
-0
app/assets/javascripts/environments/mixins/container_mixin.js
...assets/javascripts/environments/mixins/container_mixin.js
+5
-0
app/views/projects/environments/index.html.haml
app/views/projects/environments/index.html.haml
+1
-0
ee/app/assets/javascripts/environments/components/deploy_board_component.vue
...cripts/environments/components/deploy_board_component.vue
+6
-4
ee/app/assets/javascripts/environments/mixins/container_mixin.js
...assets/javascripts/environments/mixins/container_mixin.js
+5
-0
No files found.
app/assets/javascripts/environments/components/container.vue
View file @
a8b2fb45
...
...
@@ -57,6 +57,7 @@ export default {
:user-callouts-path=
"userCalloutsPath"
:lock-promotion-svg-path=
"lockPromotionSvgPath"
:help-canary-deployments-path=
"helpCanaryDeploymentsPath"
:deploy-boards-help-path=
"deployBoardsHelpPath"
/>
<table-pagination
...
...
app/assets/javascripts/environments/components/environments_app.vue
View file @
a8b2fb45
...
...
@@ -43,6 +43,11 @@ export default {
type
:
String
,
required
:
true
,
},
deployBoardsHelpPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
created
()
{
...
...
@@ -112,6 +117,7 @@ export default {
:user-callouts-path=
"userCalloutsPath"
:lock-promotion-svg-path=
"lockPromotionSvgPath"
:help-canary-deployments-path=
"helpCanaryDeploymentsPath"
:deploy-boards-help-path=
"deployBoardsHelpPath"
@
onChangePage=
"onChangePage"
>
<empty-state
...
...
app/assets/javascripts/environments/components/environments_table.vue
View file @
a8b2fb45
...
...
@@ -22,6 +22,11 @@ export default {
required
:
true
,
default
:
()
=>
[],
},
deployBoardsHelpPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
canReadEnvironment
:
{
type
:
Boolean
,
required
:
false
,
...
...
@@ -106,6 +111,7 @@ export default {
<div
class=
"deploy-board-container"
>
<deploy-board
:deploy-board-data=
"model.deployBoardData"
:deploy-boards-help-path=
"deployBoardsHelpPath"
:is-loading=
"model.isLoadingDeployBoard"
:is-empty=
"model.isEmptyDeployBoard"
:has-legacy-app-label=
"model.hasLegacyAppLabel"
...
...
app/assets/javascripts/environments/index.js
View file @
a8b2fb45
...
...
@@ -20,6 +20,7 @@ export default () =>
endpoint
:
environmentsData
.
environmentsDataEndpoint
,
newEnvironmentPath
:
environmentsData
.
newEnvironmentPath
,
helpPagePath
:
environmentsData
.
helpPagePath
,
deployBoardsHelpPath
:
environmentsData
.
deployBoardsHelpPath
,
cssContainerClass
:
environmentsData
.
cssClass
,
canCreateEnvironment
:
parseBoolean
(
environmentsData
.
canCreateEnvironment
),
canReadEnvironment
:
parseBoolean
(
environmentsData
.
canReadEnvironment
),
...
...
@@ -31,6 +32,7 @@ export default () =>
endpoint
:
this
.
endpoint
,
newEnvironmentPath
:
this
.
newEnvironmentPath
,
helpPagePath
:
this
.
helpPagePath
,
deployBoardsHelpPath
:
this
.
deployBoardsHelpPath
,
cssContainerClass
:
this
.
cssContainerClass
,
canCreateEnvironment
:
this
.
canCreateEnvironment
,
canReadEnvironment
:
this
.
canReadEnvironment
,
...
...
app/assets/javascripts/environments/mixins/container_mixin.js
View file @
a8b2fb45
...
...
@@ -25,5 +25,10 @@ export default {
required
:
false
,
default
:
null
,
},
deployBoardsHelpPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
};
app/views/projects/environments/index.html.haml
View file @
a8b2fb45
...
...
@@ -6,4 +6,5 @@
"can-create-environment"
=>
can?
(
current_user
,
:create_environment
,
@project
).
to_s
,
"new-environment-path"
=>
new_project_environment_path
(
@project
),
"help-page-path"
=>
help_page_path
(
"ci/environments"
),
"deploy-boards-help-path"
=>
help_page_path
(
"user/project/deploy_boards"
,
anchor:
"enabling-deploy-boards"
),
"css-class"
=>
container_class
}
}
ee/app/assets/javascripts/environments/components/deploy_board_component.vue
View file @
a8b2fb45
...
...
@@ -29,6 +29,11 @@ export default {
type
:
Object
,
required
:
true
,
},
deployBoardsHelpPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
isLoading
:
{
type
:
Boolean
,
required
:
true
,
...
...
@@ -100,10 +105,7 @@ export default {
<template
v-else
>
<div
v-if=
"hasLegacyAppLabel"
class=
"bs-callout bs-callout-warning mb-0 mt-0"
>
<span
v-html=
"legacyLabelWarningMessage"
></span>
<gl-link
target=
"blank"
href=
"https://docs.gitlab.com/ee/user/project/deploy_boards.html#enabling-deploy-boards"
>
<gl-link
target=
"blank"
:href=
"deployBoardsHelpPath"
>
<strong>
{{
__
(
'
More Information
'
)
}}
</strong>
</gl-link>
</div>
...
...
ee/app/assets/javascripts/environments/mixins/container_mixin.js
View file @
a8b2fb45
...
...
@@ -20,5 +20,10 @@ export default {
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