Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

4 files changed, 0 insertions, 67 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 d79da9d3b90..41edbc83cdb 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
@@ -20,21 +20,6 @@ export default {
       type: Boolean,
       required: true,
     },
-    showVisualReviewApp: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    visualReviewAppMeta: {
-      type: Object,
-      required: false,
-      default: () => ({
-        sourceProjectId: '',
-        sourceProjectPath: '',
-        mergeRequestId: '',
-        appUrl: '',
-      }),
-    },
   },
   computed: {
     computedDeploymentStatus() {
@@ -63,8 +48,6 @@ export default {
           <deployment-actions
             :deployment="deployment"
             :computed-deployment-status="computedDeploymentStatus"
-            :show-visual-review-app="showVisualReviewApp"
-            :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 7e587663c26..5ef7c2f72e0 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
@@ -33,21 +33,6 @@ export default {
       type: Object,
       required: true,
     },
-    showVisualReviewApp: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    visualReviewAppMeta: {
-      type: Object,
-      required: false,
-      default: () => ({
-        sourceProjectId: '',
-        sourceProjectPath: '',
-        mergeRequestId: '',
-        appUrl: '',
-      }),
-    },
   },
   data() {
     return {
@@ -178,8 +163,6 @@ export default {
       v-if="hasExternalUrls"
       :app-button-text="appButtonText"
       :deployment="deployment"
-      :show-visual-review-app="showVisualReviewApp"
-      :visual-review-app-meta="visualReviewAppMeta"
     />
     <deployment-action-button
       v-if="stopUrl"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_list.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_list.vue
index d23c7f016fb..d3384903cce 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_list.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_list.vue
@@ -32,11 +32,6 @@ export default {
         appUrl: '',
       }),
     },
-    showVisualReviewAppLink: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
   },
   computed: {
     showCollapsedDeployments() {
@@ -74,8 +69,6 @@ export default {
       class="gl-bg-gray-50"
       :deployment="deployment"
       :show-metrics="hasDeploymentMetrics"
-      :show-visual-review-app="showVisualReviewAppLink"
-      :visual-review-app-meta="visualReviewAppMeta"
     />
   </mr-collapsible-extension>
   <div v-else class="mr-widget-extension">
@@ -85,8 +78,6 @@ export default {
       :class="deploymentClass"
       :deployment="deployment"
       :show-metrics="hasDeploymentMetrics"
-      :show-visual-review-app="showVisualReviewAppLink"
-      :visual-review-app-meta="visualReviewAppMeta"
     />
   </div>
 </template>
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 459bee8023f..1e363b0f5fb 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
@@ -20,8 +20,6 @@ export default {
     GlLink,
     GlSearchBoxByType,
     ReviewAppLink,
-    VisualReviewAppLink: () =>
-      import('ee_component/vue_merge_request_widget/components/visual_review_app_link.vue'),
   },
   directives: {
     autofocusonshow,
@@ -35,21 +33,6 @@ export default {
       type: Object,
       required: true,
     },
-    showVisualReviewApp: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    visualReviewAppMeta: {
-      type: Object,
-      required: false,
-      default: () => ({
-        sourceProjectId: '',
-        sourceProjectPath: '',
-        mergeRequestId: '',
-        appUrl: '',
-      }),
-    },
   },
   data() {
     return { searchTerm: '' };
@@ -114,12 +97,5 @@ export default {
       size="small"
       css-class="js-deploy-url deploy-link btn btn-default btn-sm inline gl-ml-3"
     />
-    <visual-review-app-link
-      v-if="showVisualReviewApp"
-      :view-app-display="appButtonText"
-      :link="deploymentExternalUrl"
-      :app-metadata="visualReviewAppMeta"
-      :changes="deployment.changes"
-    />
   </span>
 </template>