Merge branch 'visual-review-apps-fix-dropdown' into 'master'

Move Dropdown to Stick to MR View App Button

Closes gitlab-ee#12184

See merge request gitlab-org/gitlab-ce!29767

2 files changed, 6 insertions, 11 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 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 ba9a4d2a187..22a74c8cd73 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
@@ -85,7 +85,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>