From 37aa1cfecbb5519aee8fdf973e0615b0b019da58 Mon Sep 17 00:00:00 2001
From: Andrew Fontaine <afontaine@gitlab.com>
Date: Mon, 17 Jun 2019 12:55:51 -0400
Subject: Move Dropdown to Stick to MR View App Button

The dropdown of changed pages in the review app should be attached to
the view app button. This moves it to the correct place. The Review App
button is to the right of both of those.
---
 .../vue_merge_request_widget/components/deployment.vue    | 15 +++++----------
 .../components/mr_widget_pipeline_container.vue           |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'app')

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 abe5bdd2901..de0e397903e 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
@@ -184,11 +184,6 @@ export default {
                     :link="deploymentExternalUrl"
                     :css-class="`deploy-link js-deploy-url inline ${slotProps.className}`"
                   />
-                  <visual-review-app-link
-                    v-if="showVisualReviewApp"
-                    :link="deploymentExternalUrl"
-                    :app-metadata="visualReviewAppMeta"
-                  />
                 </template>
 
                 <template slot="result" slot-scope="slotProps">
@@ -213,12 +208,12 @@ export default {
                   :link="deploymentExternalUrl"
                   css-class="js-deploy-url js-deploy-url-feature-flag deploy-link btn btn-default btn-sm inline"
                 />
-                <visual-review-app-link
-                  v-if="showVisualReviewApp"
-                  :link="deploymentExternalUrl"
-                  :app-metadata="visualReviewAppMeta"
-                />
               </template>
+              <visual-review-app-link
+                v-if="showVisualReviewApp"
+                :link="deploymentExternalUrl"
+                :app-metadata="visualReviewAppMeta"
+              />
             </template>
             <span
               v-if="deployment.stop_url"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue
index 03a15ba81ed..0379e98ca1d 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue
@@ -79,7 +79,7 @@ export default {
           :class="deploymentClass"
           :deployment="deployment"
           :show-metrics="hasDeploymentMetrics"
-          :show-visual-review-app="true"
+          :show-visual-review-app="showVisualReviewAppLink"
           :visual-review-app-meta="visualReviewAppMeta"
         />
       </div>
-- 
cgit v1.2.3