diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 12:09:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 12:09:23 +0300 |
| commit | 4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4 (patch) | |
| tree | 82591df15758864325897043f855b4e4dfcb6a56 /app/assets/javascripts/vue_merge_request_widget/components | |
| parent | 0301a0cad0063d76b1607358dc6c711ea043fdda (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components')
3 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue index 6f77d2fa779..9c476d5b2e0 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue @@ -64,7 +64,7 @@ export default { :deployment="deployment" :computed-deployment-status="computedDeploymentStatus" :show-visual-review-app="showVisualReviewApp" - :visual-review-app-metadata="visualReviewAppMeta" + :visual-review-app-meta="visualReviewAppMeta" /> </div> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue index a11e62b048a..573fc388cca 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue @@ -173,7 +173,7 @@ export default { :app-button-text="appButtonText" :deployment="deployment" :show-visual-review-app="showVisualReviewApp" - :visual-review-app-metadata="visualReviewAppMeta" + :visual-review-app-meta="visualReviewAppMeta" /> <deployment-action-button v-if="stopUrl" diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue index e1a1b1022e3..5dabd9fe5fe 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue @@ -93,8 +93,10 @@ export default { /> <visual-review-app-link v-if="showVisualReviewApp" + :view-app-display="appButtonText" :link="deploymentExternalUrl" :app-metadata="visualReviewAppMeta" + :changes="deployment.changes" /> </span> </template> |