removed useless v-if

removed pointless test & changed some deployment tests to make more sense
added in v-tooltip

2 files changed, 3 insertions, 8 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
index dc91f8ca68c..7bef2e97349 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
@@ -119,16 +119,15 @@ export default {
           </template>
           <span
             v-if="hasDeploymentTime"
-            :data-title="deployment.deployed_at_formatted"
+            v-tooltip
+            :title="deployment.deployed_at_formatted"
             class="js-deploy-time"
-            data-toggle="tooltip"
-            data-placement="top"
           >
             {{ deployTimeago }}
           </span>
           <loading-button
             v-if="deployment.stop_url"
-            container-class="btn btn-default btn-xs"
+            container-class="btn btn-default btn-xs prepend-left-default"
             label="Stop environment"
             :loading="isStopping"
             @click="stopEnvironment"
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
index 3675a2eaa85..169adfe0a1d 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
@@ -67,9 +67,6 @@ export default {
     shouldRenderRelatedLinks() {
       return !!this.mr.relatedLinks && !this.mr.isNothingToMergeState;
     },
-    shouldRenderDeployments() {
-      return this.mr.deployments.length;
-    },
     shouldRenderSourceBranchRemovalStatus() {
       return !this.mr.canRemoveSourceBranch && this.mr.shouldRemoveSourceBranch &&
         (!this.mr.isNothingToMergeState && !this.mr.isMergedState);
@@ -251,7 +248,6 @@ export default {
         :has-ci="mr.hasCI"
         />
       <deployment
-        v-if="shouldRenderDeployments"
         v-for="deployment in mr.deployments"
         :key="deployment.id"
         :deployment="deployment"