Merge branch 'fix-geo-bundle' into 'master'

Remove unnecessary Vue usage

See merge request !1363

app/assets/javascripts/geo/components/geo_clone_dialog.js

-/* global Vue */
-
-(() => {
-  window.gl = window.gl || {};
-  window.gl.geo = window.gl.geo || {};
-
-  window.gl.geo.CloneDialog = Vue.extend({
-    props: ['title', 'id'],
-    data() {
-      return this.$parent.$data;
-    },
-    mounted() {
-      $(`#${this.id}`).appendTo('body').modal({ modal: true, show: false });
-    },
-    template: `
-      <div class="modal in" tabindex="-1" :id="id">
-          <div class="modal-dialog">
-              <div class="modal-content">
-                  <div class="modal-header">
-                      <a href="#" data-dismiss="modal" class="close">×</a>
-                      <h3>{{title}}</h3>
-                  </div>
-                  <div class="modal-body">
-                      <p><strong>Step 1.</strong> Clone the repository from your secondary node:</p> 
-                      <slot name="clipboard-1"></slot>
-                      <pre class="dark" id="geo-info-1">git clone {{cloneUrlSecondary}}</pre>
-                      
-                      <p><strong>Step 2.</strong> Go to the new directory and define <strong>primary node's</strong> repository URL as the <strong>push</strong> remote:</p>
-                      <slot name="clipboard-2"></slot>
-                      <pre class="dark" id="geo-info-2">git remote set-url --push origin {{cloneUrlPrimary || '&lt;clone url for primary repository&gt;'}}</pre> 
-                      <p><strong>Done.</strong> You can now commit and push code as you normally do, but with increased speed.</p>
-                  </div>
-              </div>
-          </div>
-      </div>
-        `,
-  });
-})();

app/assets/javascripts/geo/geo_bundle.js

-/* global Vue */
-
-window.Vue = require('vue');
-require('./components/geo_clone_dialog');
-
-$(document).ready(() => {
-  window.gl = window.gl || {};
-  const $geoClone = document.getElementById('geo-clone');
-
-  if ($geoClone) {
-    gl.GeoClone = new Vue({
-      el: $geoClone,
-      components: {
-        'geo-clone-dialog': gl.geo.CloneDialog,
-      },
-      data: Object.assign({}, $geoClone.dataset),
-    });
-  }
-});

app/assets/javascripts/main.js

@@ -206,7 +206,6 @@ require('./wikis');
 require('./zen_mode');
 
 // EE-only scripts
-require('./geo/geo_bundle');
 require('./admin_email_select');
 require('./application_settings');
 require('./approvals');

app/views/shared/_clone_panel.html.haml

@@ -38,10 +38,10 @@
     e.preventDefault();
     var $this = $(this);
 
-    if (gl.GeoClone) {
-      gl.GeoClone.cloneUrlSecondary = $this.attr('href');
-      gl.GeoClone.cloneUrlPrimary = $this.data('primaryUrl');
-    }
+    $('#modal-geo-info').data({
+      cloneUrlSecondary: $this.attr('href'),
+      cloneUrlPrimary: $this.data('primaryUrl') || ''
+    });
   });
 
 = render 'shared/geo_info_modal', project: project if Gitlab::Geo.secondary?

app/views/shared/_geo_info_modal.html.haml

-#geo-clone{ data: { clone_url_secondary: h(default_url_to_repo(project)), clone_url_primary: h(geo_primary_default_url_to_repo(project)) } }
-  %geo-clone-dialog{ id: 'modal-geo-info', title: 'How to work faster with Geo' }
-    %span{ slot: 'clipboard-1' }
-      = clipboard_button(clipboard_target: 'pre#geo-info-1')
-    %span{ slot: 'clipboard-2' }
-      = clipboard_button(clipboard_target: 'pre#geo-info-2')
+#modal-geo-info.modal.in{ tabindex: '-1', data: { clone_url_secondary: h(default_url_to_repo(project)), clone_url_primary: h(geo_primary_default_url_to_repo(project)) } }
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %a.close{ href: '#', data: { dismiss: 'modal' } }
+        %h3= 'How to work faster with Geo'
+      .modal-body
+        %p
+          %strong= 'Step 1.'
+          Clone the repository from your secondary node:
+        = clipboard_button(clipboard_target: 'pre#geo-info-1')
+        %pre#geo-info-1.dark
+          git clone
+          = default_url_to_repo()
+        %p
+          %strong= 'Step 2.'
+          Go to the new directory and define
+          %strong= "primary node's"
+          repository URL as the
+          %strong= 'push'
+          remote:
+        = clipboard_button(clipboard_target: 'pre#geo-info-2')
+        %pre#geo-info-2.dark
+          git remote set-url --push origin <clone url for primary repository>
+
+        %p
+          %strong= 'Done.'
+          You can now commit and push code as you normally do, but with increased speed.
+
+:javascript
+  $('#modal-geo-info')
+    .appendTo('body')
+    .modal({ modal: true, show: false })
+    .on('show.bs.modal', function() {
+      var data = $(this).data();
+      $('#geo-info-1').text(
+        'git clone ' +
+        (data.cloneUrlSecondary || '<clone url for secondary repository>')
+      );
+      $('geo-info-2').text(
+        'git remote set-url --push origin ' +
+        (data.cloneUrlPrimary || '<clone url for primary repository>')
+      );
+    });