From d014775d13add961624db1b59a5e582b0c58b29a Mon Sep 17 00:00:00 2001
From: George Tsiolis <tsiolis.g@gmail.com>
Date: Thu, 19 Apr 2018 13:57:12 +0300
Subject: Move discussion actions to the right for small viewports

---
 .../javascripts/notes/components/note_header.vue   | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue
index c3d1ef1fcc6..fbfd6f92c85 100644
--- a/app/assets/javascripts/notes/components/note_header.vue
+++ b/app/assets/javascripts/notes/components/note_header.vue
@@ -62,6 +62,21 @@ export default {
 
 <template>
   <div class="note-header-info">
+    <div
+      v-if="includeToggle"
+      class="discussion-actions">
+      <button
+        @click="handleToggle"
+        class="note-action-button discussion-toggle-button js-vue-toggle-button"
+        type="button">
+        <i
+          :class="toggleChevronClass"
+          class="fa"
+          aria-hidden="true">
+        </i>
+        Toggle discussion
+      </button>
+    </div>
     <a :href="author.path">
       <span class="note-header-author-name">{{ author.name }}</span>
       <span class="note-headline-light">
@@ -95,20 +110,5 @@ export default {
         </i>
       </span>
     </span>
-    <div
-      v-if="includeToggle"
-      class="discussion-actions">
-      <button
-        @click="handleToggle"
-        class="note-action-button discussion-toggle-button js-vue-toggle-button"
-        type="button">
-        <i
-          :class="toggleChevronClass"
-          class="fa"
-          aria-hidden="true">
-        </i>
-        Toggle discussion
-      </button>
-    </div>
   </div>
 </template>
-- 
cgit v1.2.1


From 86b8fd3b1aa8b5724d4aa425f43a812519a4c8d0 Mon Sep 17 00:00:00 2001
From: Constance Okoghenun <cokoghenun@gitlab.com>
Date: Thu, 3 May 2018 09:29:17 +0100
Subject: Changed delete wiki prompt from 'confirm' for 'gl_modal'

---
 .../wikis/components/delete_wiki_modal.vue         | 63 ++++++++++++++++++++++
 .../javascripts/pages/projects/wikis/index.js      | 22 ++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
new file mode 100644
index 00000000000..6a4d3f56229
--- /dev/null
+++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
@@ -0,0 +1,63 @@
+<script>
+import GlModal from '~/vue_shared/components/gl_modal.vue';
+  import { s__} from '~/locale';
+
+export default {
+  components: {
+    GlModal
+  },
+  props: {
+    deleteWikiUrl: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    csrfToken: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+  computed: {
+    text() {
+      return s__('WikiPageConfirmDelete|Are you sure you want to delete this page?')
+    }
+  },
+  methods: {
+    onSubmit() {
+      this.$refs.form.submit();
+    }
+  }
+}
+</script>
+
+<template>
+  <gl-modal
+    id="delete-wiki-modal"
+    :header-title-text="s__('WikiPageConfirmDelete|Delete Wiki?')"
+    footer-primary-button-variant="danger"
+    :footer-primary-button-text="s__('WikiPageConfirmDelete|Delete')"
+    @submit="onSubmit"
+  >
+    {{ text }}
+
+    <form
+        ref="form"
+        :action="deleteWikiUrl"
+        method="post"
+      >
+        <input
+          ref="method"
+          type="hidden"
+          name="_method"
+          value="delete"
+        />
+        <input
+          type="hidden"
+          name="authenticity_token"
+          :value="csrfToken"
+        />
+      </form>
+  </gl-modal>
+</template>
+
diff --git a/app/assets/javascripts/pages/projects/wikis/index.js b/app/assets/javascripts/pages/projects/wikis/index.js
index ec01c66ffda..467f65541ec 100644
--- a/app/assets/javascripts/pages/projects/wikis/index.js
+++ b/app/assets/javascripts/pages/projects/wikis/index.js
@@ -1,12 +1,34 @@
 import $ from 'jquery';
+import Vue from 'vue';
+import Translate from '~/vue_shared/translate';
+import csrf from '~/lib/utils/csrf';
 import Wikis from './wikis';
 import ShortcutsWiki from '../../../shortcuts_wiki';
 import ZenMode from '../../../zen_mode';
 import GLForm from '../../../gl_form';
+import deleteWikiModal from './components/delete_wiki_modal.vue';
 
 document.addEventListener('DOMContentLoaded', () => {
   new Wikis(); // eslint-disable-line no-new
   new ShortcutsWiki(); // eslint-disable-line no-new
   new ZenMode(); // eslint-disable-line no-new
   new GLForm($('.wiki-form'), true); // eslint-disable-line no-new
+
+  Vue.use(Translate);
+  const { deleteWikiUrl } = document.getElementById('delete-wiki-button').dataset;
+  const deleteWikiModalEl = document.getElementById('delete-wiki-modal');
+  const deleteModal = new Vue({
+    el: deleteWikiModalEl,
+    data: {
+      deleteWikiUrl: '',
+    },
+    render(createElement) {
+      return createElement(deleteWikiModal, {
+        props: {
+          deleteWikiUrl,
+          csrfToken: csrf.token,
+        },
+      });
+    },
+  });
 });
-- 
cgit v1.2.1


From c9b5c42b1862675ad43e4e8e7411f7048be8abfc Mon Sep 17 00:00:00 2001
From: Constance Okoghenun <cokoghenun@gitlab.com>
Date: Thu, 3 May 2018 12:41:28 +0100
Subject: Added commit form fields for delete page confirmation

---
 .../wikis/components/delete_wiki_modal.vue         | 58 +++++++++++++++++++---
 .../javascripts/pages/projects/wikis/index.js      |  5 +-
 2 files changed, 54 insertions(+), 9 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
index 6a4d3f56229..af0b86ea816 100644
--- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
+++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
@@ -1,6 +1,7 @@
 <script>
+import _ from 'underscore';
 import GlModal from '~/vue_shared/components/gl_modal.vue';
-  import { s__} from '~/locale';
+import { s__, sprintf } from '~/locale';
 
 export default {
   components: {
@@ -12,6 +13,11 @@ export default {
       required: false,
       default: '',
     },
+    pageTitle: {
+      type: String,
+      required: false,
+      default: '',
+    },
     csrfToken: {
       type: String,
       required: false,
@@ -19,8 +25,22 @@ export default {
     },
   },
   computed: {
-    text() {
-      return s__('WikiPageConfirmDelete|Are you sure you want to delete this page?')
+    message() {
+     return  sprintf(s__('WikiPageConfirmDelete|Delete %{pageTitle}'),
+        {
+          pageTitle: _.escape(this.pageTitle),
+        },
+        false,
+      );
+    },
+
+    title() {
+      return  sprintf(s__('WikiPageConfirmDelete|Delete Page %{pageTitle}?'),
+        {
+          pageTitle: `'${_.escape(this.pageTitle)}'`,
+        },
+        false,
+      );
     }
   },
   methods: {
@@ -34,17 +54,16 @@ export default {
 <template>
   <gl-modal
     id="delete-wiki-modal"
-    :header-title-text="s__('WikiPageConfirmDelete|Delete Wiki?')"
+    :header-title-text="title"
     footer-primary-button-variant="danger"
-    :footer-primary-button-text="s__('WikiPageConfirmDelete|Delete')"
+    :footer-primary-button-text="s__('WikiPageConfirmDelete|Delete Page')"
     @submit="onSubmit"
   >
-    {{ text }}
-
     <form
         ref="form"
         :action="deleteWikiUrl"
         method="post"
+        class="form-horizontal js-requires-input"
       >
         <input
           ref="method"
@@ -57,6 +76,31 @@ export default {
           name="authenticity_token"
           :value="csrfToken"
         />
+
+        <div class="form-group">
+          <div class="col-sm-12">
+              <label for="commit_message" class="control-label-full-width">Commit Message</label>
+            </div>
+          <div class="col-sm-12">
+            <div class="commit-message-container">
+              <textarea
+                id="commit_message"
+                rows="3"
+                name="commit_message"
+                :value="message"
+                class="form-control js-commit-message" required></textarea>
+            </div>
+            
+          </div>
+        </div>
+        <div class="form-group">
+          <div class="col-sm-12">
+            <label for="branch_name" class="control-label-full-width">Target Branch</label>
+          </div>
+          <div class="col-sm-12">
+            <input type="text" name="branch_name" class="form-control js-commit-message ref-name" required />
+          </div>
+        </div>
       </form>
   </gl-modal>
 </template>
diff --git a/app/assets/javascripts/pages/projects/wikis/index.js b/app/assets/javascripts/pages/projects/wikis/index.js
index 467f65541ec..169fa5d85a8 100644
--- a/app/assets/javascripts/pages/projects/wikis/index.js
+++ b/app/assets/javascripts/pages/projects/wikis/index.js
@@ -15,9 +15,9 @@ document.addEventListener('DOMContentLoaded', () => {
   new GLForm($('.wiki-form'), true); // eslint-disable-line no-new
 
   Vue.use(Translate);
-  const { deleteWikiUrl } = document.getElementById('delete-wiki-button').dataset;
+  const { deleteWikiUrl, pageTitle } = document.getElementById('delete-wiki-button').dataset;
   const deleteWikiModalEl = document.getElementById('delete-wiki-modal');
-  const deleteModal = new Vue({
+  const deleteModal = new Vue({ // eslint-disable-line
     el: deleteWikiModalEl,
     data: {
       deleteWikiUrl: '',
@@ -25,6 +25,7 @@ document.addEventListener('DOMContentLoaded', () => {
     render(createElement) {
       return createElement(deleteWikiModal, {
         props: {
+          pageTitle,
           deleteWikiUrl,
           csrfToken: csrf.token,
         },
-- 
cgit v1.2.1


From 77a925f4a6bff04f0b40255e4dced741818149d7 Mon Sep 17 00:00:00 2001
From: George Tsiolis <tsiolis.g@gmail.com>
Date: Thu, 26 Apr 2018 12:06:31 +0300
Subject: Reorder discussion timestamp information for issues

---
 app/assets/javascripts/notes/components/note_edited_text.vue | 10 +++++-----
 app/assets/javascripts/notes/components/note_header.vue      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/notes/components/note_edited_text.vue b/app/assets/javascripts/notes/components/note_edited_text.vue
index 4ddca918495..2dc39d1a186 100644
--- a/app/assets/javascripts/notes/components/note_edited_text.vue
+++ b/app/assets/javascripts/notes/components/note_edited_text.vue
@@ -32,17 +32,17 @@ export default {
 <template>
   <div :class="className">
     {{ actionText }}
-    <time-ago-tooltip
-      :time="editedAt"
-      tooltip-placement="bottom"
-    />
     <template v-if="editedBy">
-      by
+      {{ s__('ByAuthor|by') }}
       <a
         :href="editedBy.path"
         class="js-vue-author author_link">
         {{ editedBy.name }}
       </a>
     </template>
+    <time-ago-tooltip
+      :time="editedAt"
+      tooltip-placement="bottom"
+    />
   </div>
 </template>
diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue
index fbfd6f92c85..7183d0b50b2 100644
--- a/app/assets/javascripts/notes/components/note_header.vue
+++ b/app/assets/javascripts/notes/components/note_header.vue
@@ -74,7 +74,7 @@ export default {
           class="fa"
           aria-hidden="true">
         </i>
-        Toggle discussion
+        {{ __('Toggle discussion') }}
       </button>
     </div>
     <a :href="author.path">
-- 
cgit v1.2.1


From 6948b56cddaf0848345945003ffcbc8715c61a04 Mon Sep 17 00:00:00 2001
From: Constance Okoghenun <cokoghenun@gitlab.com>
Date: Mon, 7 May 2018 13:35:28 +0100
Subject: Added modal message and removed traget branch and commit message
 fields for delete wiki page modal

---
 .../wikis/components/delete_wiki_modal.vue         | 50 +++++-----------------
 1 file changed, 10 insertions(+), 40 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
index af0b86ea816..85c14b6af77 100644
--- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
+++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
@@ -5,7 +5,7 @@ import { s__, sprintf } from '~/locale';
 
 export default {
   components: {
-    GlModal
+    GlModal,
   },
   props: {
     deleteWikiUrl: {
@@ -26,29 +26,24 @@ export default {
   },
   computed: {
     message() {
-     return  sprintf(s__('WikiPageConfirmDelete|Delete %{pageTitle}'),
-        {
-          pageTitle: _.escape(this.pageTitle),
-        },
-        false,
-      );
+      return s__('WikiPageConfirmDelete|Are you sure you want to delete this page?');
     },
-
     title() {
-      return  sprintf(s__('WikiPageConfirmDelete|Delete Page %{pageTitle}?'),
+      return sprintf(
+        s__('WikiPageConfirmDelete|Delete Page %{pageTitle}?'),
         {
           pageTitle: `'${_.escape(this.pageTitle)}'`,
         },
-        false,
+        false
       );
-    }
+    },
   },
   methods: {
     onSubmit() {
       this.$refs.form.submit();
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <template>
@@ -59,6 +54,7 @@ export default {
     :footer-primary-button-text="s__('WikiPageConfirmDelete|Delete Page')"
     @submit="onSubmit"
   >
+    {{ message }}
     <form
         ref="form"
         :action="deleteWikiUrl"
@@ -76,32 +72,6 @@ export default {
           name="authenticity_token"
           :value="csrfToken"
         />
-
-        <div class="form-group">
-          <div class="col-sm-12">
-              <label for="commit_message" class="control-label-full-width">Commit Message</label>
-            </div>
-          <div class="col-sm-12">
-            <div class="commit-message-container">
-              <textarea
-                id="commit_message"
-                rows="3"
-                name="commit_message"
-                :value="message"
-                class="form-control js-commit-message" required></textarea>
-            </div>
-            
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="col-sm-12">
-            <label for="branch_name" class="control-label-full-width">Target Branch</label>
-          </div>
-          <div class="col-sm-12">
-            <input type="text" name="branch_name" class="form-control js-commit-message ref-name" required />
-          </div>
-        </div>
       </form>
   </gl-modal>
 </template>
-
-- 
cgit v1.2.1


From fe7e18185f1bd22ed6952d90ff4dede34b5c68f5 Mon Sep 17 00:00:00 2001
From: Constance Okoghenun <cokoghenun@gitlab.com>
Date: Mon, 7 May 2018 13:46:25 +0100
Subject: Fixed linit errors

---
 .../wikis/components/delete_wiki_modal.vue         | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
index 85c14b6af77..1943113fc1b 100644
--- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
+++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
@@ -34,7 +34,7 @@ export default {
         {
           pageTitle: `'${_.escape(this.pageTitle)}'`,
         },
-        false
+        false,
       );
     },
   },
@@ -56,22 +56,22 @@ export default {
   >
     {{ message }}
     <form
-        ref="form"
-        :action="deleteWikiUrl"
-        method="post"
-        class="form-horizontal js-requires-input"
-      >
-        <input
-          ref="method"
-          type="hidden"
-          name="_method"
-          value="delete"
-        />
-        <input
-          type="hidden"
-          name="authenticity_token"
-          :value="csrfToken"
-        />
-      </form>
+      ref="form"
+      :action="deleteWikiUrl"
+      method="post"
+      class="form-horizontal js-requires-input"
+    >
+      <input
+        ref="method"
+        type="hidden"
+        name="_method"
+        value="delete"
+      />
+      <input
+        type="hidden"
+        name="authenticity_token"
+        :value="csrfToken"
+      />
+    </form>
   </gl-modal>
 </template>
-- 
cgit v1.2.1


From 22651a63901c04445be571c788c51921b1ddac45 Mon Sep 17 00:00:00 2001
From: Constance Okoghenun <cokoghenun@gitlab.com>
Date: Mon, 7 May 2018 15:00:13 +0100
Subject: Removed quotes around page title

---
 .../javascripts/pages/projects/wikis/components/delete_wiki_modal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
index 1943113fc1b..ce5f28b464c 100644
--- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
+++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
@@ -30,9 +30,9 @@ export default {
     },
     title() {
       return sprintf(
-        s__('WikiPageConfirmDelete|Delete Page %{pageTitle}?'),
+        s__('WikiPageConfirmDelete|Delete %{pageTitle}?'),
         {
-          pageTitle: `'${_.escape(this.pageTitle)}'`,
+          pageTitle: _.escape(this.pageTitle),
         },
         false,
       );
-- 
cgit v1.2.1


From 504ef7a5a2e6203c8bc4db091f0876e05b8b8f67 Mon Sep 17 00:00:00 2001
From: Constance Okoghenun <cokoghenun@gitlab.com>
Date: Mon, 7 May 2018 17:45:33 +0100
Subject: Made delete wiki modal component props required and changed the
 component init behaviour

---
 .../wikis/components/delete_wiki_modal.vue         |  6 ++--
 .../javascripts/pages/projects/wikis/index.js      | 41 ++++++++++++----------
 2 files changed, 26 insertions(+), 21 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
index ce5f28b464c..e59758b14a0 100644
--- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
+++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
@@ -10,17 +10,17 @@ export default {
   props: {
     deleteWikiUrl: {
       type: String,
-      required: false,
+      required: true,
       default: '',
     },
     pageTitle: {
       type: String,
-      required: false,
+      required: true,
       default: '',
     },
     csrfToken: {
       type: String,
-      required: false,
+      required: true,
       default: '',
     },
   },
diff --git a/app/assets/javascripts/pages/projects/wikis/index.js b/app/assets/javascripts/pages/projects/wikis/index.js
index 169fa5d85a8..0295653cb29 100644
--- a/app/assets/javascripts/pages/projects/wikis/index.js
+++ b/app/assets/javascripts/pages/projects/wikis/index.js
@@ -14,22 +14,27 @@ document.addEventListener('DOMContentLoaded', () => {
   new ZenMode(); // eslint-disable-line no-new
   new GLForm($('.wiki-form'), true); // eslint-disable-line no-new
 
-  Vue.use(Translate);
-  const { deleteWikiUrl, pageTitle } = document.getElementById('delete-wiki-button').dataset;
-  const deleteWikiModalEl = document.getElementById('delete-wiki-modal');
-  const deleteModal = new Vue({ // eslint-disable-line
-    el: deleteWikiModalEl,
-    data: {
-      deleteWikiUrl: '',
-    },
-    render(createElement) {
-      return createElement(deleteWikiModal, {
-        props: {
-          pageTitle,
-          deleteWikiUrl,
-          csrfToken: csrf.token,
-        },
-      });
-    },
-  });
+  const deleteWikiButton = document.getElementById('delete-wiki-button');
+
+  if (deleteWikiButton) {
+    Vue.use(Translate);
+
+    const { deleteWikiUrl, pageTitle } = deleteWikiButton.dataset;
+    const deleteWikiModalEl = document.getElementById('delete-wiki-modal');
+    const deleteModal = new Vue({ // eslint-disable-line
+      el: deleteWikiModalEl,
+      data: {
+        deleteWikiUrl: '',
+      },
+      render(createElement) {
+        return createElement(deleteWikiModal, {
+          props: {
+            pageTitle,
+            deleteWikiUrl,
+            csrfToken: csrf.token,
+          },
+        });
+      },
+    });
+  }
 });
-- 
cgit v1.2.1


From f30de1bf431f5e668d0d296ca304c489ad8e2fcf Mon Sep 17 00:00:00 2001
From: Constance Okoghenun <cokoghenun@gitlab.com>
Date: Mon, 7 May 2018 23:31:00 +0100
Subject: Changed copy of delete button to sentence case

---
 .../javascripts/pages/projects/wikis/components/delete_wiki_modal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
index e59758b14a0..df21e2f8771 100644
--- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
+++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
@@ -30,7 +30,7 @@ export default {
     },
     title() {
       return sprintf(
-        s__('WikiPageConfirmDelete|Delete %{pageTitle}?'),
+        s__('WikiPageConfirmDelete|Delete page %{pageTitle}?'),
         {
           pageTitle: _.escape(this.pageTitle),
         },
@@ -51,7 +51,7 @@ export default {
     id="delete-wiki-modal"
     :header-title-text="title"
     footer-primary-button-variant="danger"
-    :footer-primary-button-text="s__('WikiPageConfirmDelete|Delete Page')"
+    :footer-primary-button-text="s__('WikiPageConfirmDelete|Delete page')"
     @submit="onSubmit"
   >
     {{ message }}
-- 
cgit v1.2.1


From e286942185b85149f21531e491c0c93a04acbe0f Mon Sep 17 00:00:00 2001
From: George Tsiolis <tsiolis.g@gmail.com>
Date: Tue, 8 May 2018 14:06:11 +0300
Subject: Move SquashBeforeMerge vue component

---
 .../components/states/mr_widget_squash_before_merge.js    | 15 ---------------
 .../components/states/mr_widget_squash_before_merge.vue   | 15 +++++++++++++++
 .../javascripts/vue_merge_request_widget/dependencies.js  |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js
 create mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js
deleted file mode 100644
index bf8628d18a6..00000000000
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-The squash-before-merge button is EE only, but it's located right in the middle
-of the readyToMerge state component template.
-
-If we didn't declare this component in CE, we'd need to maintain a separate copy
-of the readyToMergeState template in EE, which is pretty big and likely to change.
-
-Instead, in CE, we declare the component, but it's hidden and is configured to do nothing.
-In EE, the configuration extends this object to add a functioning squash-before-merge
-button.
-*/
-
-export default {
-  template: '',
-};
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue
new file mode 100644
index 00000000000..926a3172412
--- /dev/null
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue
@@ -0,0 +1,15 @@
+/*
+The squash-before-merge button is EE only, but it's located right in the middle
+of the readyToMerge state component template.
+
+If we didn't declare this component in CE, we'd need to maintain a separate copy
+of the readyToMergeState template in EE, which is pretty big and likely to change.
+
+Instead, in CE, we declare the component, but it's hidden and is configured to do nothing.
+In EE, the configuration extends this object to add a functioning squash-before-merge
+button.
+*/
+
+<script>
+  export default {};
+</script>
diff --git a/app/assets/javascripts/vue_merge_request_widget/dependencies.js b/app/assets/javascripts/vue_merge_request_widget/dependencies.js
index 7f5f28091da..5cb84b7a226 100644
--- a/app/assets/javascripts/vue_merge_request_widget/dependencies.js
+++ b/app/assets/javascripts/vue_merge_request_widget/dependencies.js
@@ -41,7 +41,7 @@ export { default as MRWidgetService } from './services/mr_widget_service';
 export { default as eventHub } from './event_hub';
 export { default as getStateKey } from './stores/get_state_key';
 export { default as stateMaps } from './stores/state_maps';
-export { default as SquashBeforeMerge } from './components/states/mr_widget_squash_before_merge';
+export { default as SquashBeforeMerge } from './components/states/mr_widget_squash_before_merge.vue';
 export { default as notify } from '../lib/utils/notify';
 export { default as SourceBranchRemovalStatus } from './components/source_branch_removal_status.vue';
 
-- 
cgit v1.2.1


From e9e414a79af53c2155d10993d8580c386120a983 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 10 May 2018 18:04:17 +0100
Subject: Moves mr widget to a vue component Prevents maintainer edit to render
 a blank div Properly names sha mismatch component

---
 .../components/mr_widget_maintainer_edit.vue       |  20 --
 .../vue_merge_request_widget/dependencies.js       |   3 +-
 .../vue_merge_request_widget/mr_widget_options.js  | 277 --------------------
 .../vue_merge_request_widget/mr_widget_options.vue | 290 +++++++++++++++++++++
 4 files changed, 291 insertions(+), 299 deletions(-)
 delete mode 100644 app/assets/javascripts/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue
 delete mode 100644 app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
 create mode 100644 app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue
deleted file mode 100644
index f0298f732ea..00000000000
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<script>
-  export default {
-    name: 'MRWidgetMaintainerEdit',
-    props: {
-      maintainerEditAllowed: {
-        type: Boolean,
-        default: false,
-        required: false,
-      },
-    },
-  };
-</script>
-
-<template>
-  <section class="mr-info-list mr-links">
-    <p v-if="maintainerEditAllowed">
-      {{ s__("mrWidget|Allows edits from maintainers") }}
-    </p>
-  </section>
-</template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/dependencies.js b/app/assets/javascripts/vue_merge_request_widget/dependencies.js
index 7f5f28091da..c056d2a8709 100644
--- a/app/assets/javascripts/vue_merge_request_widget/dependencies.js
+++ b/app/assets/javascripts/vue_merge_request_widget/dependencies.js
@@ -15,7 +15,6 @@ export { default as WidgetHeader } from './components/mr_widget_header.vue';
 export { default as WidgetMergeHelp } from './components/mr_widget_merge_help.vue';
 export { default as WidgetPipeline } from './components/mr_widget_pipeline.vue';
 export { default as Deployment } from './components/deployment.vue';
-export { default as WidgetMaintainerEdit } from './components/mr_widget_maintainer_edit.vue';
 export { default as WidgetRelatedLinks } from './components/mr_widget_related_links.vue';
 export { default as MergedState } from './components/states/mr_widget_merged.vue';
 export { default as FailedToMerge } from './components/states/mr_widget_failed_to_merge.vue';
@@ -45,4 +44,4 @@ export { default as SquashBeforeMerge } from './components/states/mr_widget_squa
 export { default as notify } from '../lib/utils/notify';
 export { default as SourceBranchRemovalStatus } from './components/source_branch_removal_status.vue';
 
-export { default as mrWidgetOptions } from './mr_widget_options';
+export { default as mrWidgetOptions } from './mr_widget_options.vue';
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
deleted file mode 100644
index 345f9ac1b4b..00000000000
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
+++ /dev/null
@@ -1,277 +0,0 @@
-import Project from '~/pages/projects/project';
-import SmartInterval from '~/smart_interval';
-import Flash from '../flash';
-import {
-  WidgetHeader,
-  WidgetMergeHelp,
-  WidgetPipeline,
-  Deployment,
-  WidgetMaintainerEdit,
-  WidgetRelatedLinks,
-  MergedState,
-  ClosedState,
-  MergingState,
-  RebaseState,
-  WorkInProgressState,
-  ArchivedState,
-  ConflictsState,
-  NothingToMergeState,
-  MissingBranchState,
-  NotAllowedState,
-  ReadyToMergeState,
-  ShaMismatchState,
-  UnresolvedDiscussionsState,
-  PipelineBlockedState,
-  PipelineFailedState,
-  FailedToMerge,
-  MergeWhenPipelineSucceedsState,
-  AutoMergeFailed,
-  CheckingState,
-  MRWidgetStore,
-  MRWidgetService,
-  eventHub,
-  stateMaps,
-  SquashBeforeMerge,
-  notify,
-  SourceBranchRemovalStatus,
-} from './dependencies';
-import { setFavicon } from '../lib/utils/common_utils';
-
-export default {
-  el: '#js-vue-mr-widget',
-  name: 'MRWidget',
-  props: {
-    mrData: {
-      type: Object,
-      required: false,
-    },
-  },
-  data() {
-    const store = new MRWidgetStore(this.mrData || window.gl.mrWidgetData);
-    const service = this.createService(store);
-    return {
-      mr: store,
-      service,
-    };
-  },
-  computed: {
-    componentName() {
-      return stateMaps.stateToComponentMap[this.mr.state];
-    },
-    shouldRenderMergeHelp() {
-      return stateMaps.statesToShowHelpWidget.indexOf(this.mr.state) > -1;
-    },
-    shouldRenderPipelines() {
-      return this.mr.hasCI;
-    },
-    shouldRenderRelatedLinks() {
-      return !!this.mr.relatedLinks && !this.mr.isNothingToMergeState;
-    },
-    shouldRenderSourceBranchRemovalStatus() {
-      return !this.mr.canRemoveSourceBranch && this.mr.shouldRemoveSourceBranch &&
-        (!this.mr.isNothingToMergeState && !this.mr.isMergedState);
-    },
-  },
-  methods: {
-    createService(store) {
-      const endpoints = {
-        mergePath: store.mergePath,
-        mergeCheckPath: store.mergeCheckPath,
-        cancelAutoMergePath: store.cancelAutoMergePath,
-        removeWIPPath: store.removeWIPPath,
-        sourceBranchPath: store.sourceBranchPath,
-        ciEnvironmentsStatusPath: store.ciEnvironmentsStatusPath,
-        statusPath: store.statusPath,
-        mergeActionsContentPath: store.mergeActionsContentPath,
-        rebasePath: store.rebasePath,
-      };
-      return new MRWidgetService(endpoints);
-    },
-    checkStatus(cb) {
-      return this.service.checkStatus()
-        .then(res => res.data)
-        .then((data) => {
-          this.handleNotification(data);
-          this.mr.setData(data);
-          this.setFaviconHelper();
-
-          if (cb) {
-            cb.call(null, data);
-          }
-        })
-        .catch(() => new Flash('Something went wrong. Please try again.'));
-    },
-    initPolling() {
-      this.pollingInterval = new SmartInterval({
-        callback: this.checkStatus,
-        startingInterval: 10000,
-        maxInterval: 30000,
-        hiddenInterval: 120000,
-        incrementByFactorOf: 5000,
-      });
-    },
-    initDeploymentsPolling() {
-      this.deploymentsInterval = new SmartInterval({
-        callback: this.fetchDeployments,
-        startingInterval: 30000,
-        maxInterval: 120000,
-        hiddenInterval: 240000,
-        incrementByFactorOf: 15000,
-        immediateExecution: true,
-      });
-    },
-    setFaviconHelper() {
-      if (this.mr.ciStatusFaviconPath) {
-        setFavicon(this.mr.ciStatusFaviconPath);
-      }
-    },
-    fetchDeployments() {
-      return this.service.fetchDeployments()
-        .then(res => res.data)
-        .then((data) => {
-          if (data.length) {
-            this.mr.deployments = data;
-          }
-        })
-        .catch(() => {
-          new Flash('Something went wrong while fetching the environments for this merge request. Please try again.'); // eslint-disable-line
-        });
-    },
-    fetchActionsContent() {
-      this.service.fetchMergeActionsContent()
-        .then((res) => {
-          if (res.data) {
-            const el = document.createElement('div');
-            el.innerHTML = res.data;
-            document.body.appendChild(el);
-            Project.initRefSwitcher();
-          }
-        })
-        .catch(() => new Flash('Something went wrong. Please try again.'));
-    },
-    handleNotification(data) {
-      if (data.ci_status === this.mr.ciStatus) return;
-      if (!data.pipeline) return;
-
-      const label = data.pipeline.details.status.label;
-      const title = `Pipeline ${label}`;
-      const message = `Pipeline ${label} for "${data.title}"`;
-
-      notify.notifyMe(title, message, this.mr.gitlabLogo);
-    },
-    resumePolling() {
-      this.pollingInterval.resume();
-    },
-    stopPolling() {
-      this.pollingInterval.stopTimer();
-    },
-    bindEventHubListeners() {
-      eventHub.$on('MRWidgetUpdateRequested', (cb) => {
-        this.checkStatus(cb);
-      });
-
-      // `params` should be an Array contains a Boolean, like `[true]`
-      // Passing parameter as Boolean didn't work.
-      eventHub.$on('SetBranchRemoveFlag', (params) => {
-        this.mr.isRemovingSourceBranch = params[0];
-      });
-
-      eventHub.$on('FailedToMerge', (mergeError) => {
-        this.mr.state = 'failedToMerge';
-        this.mr.mergeError = mergeError;
-      });
-
-      eventHub.$on('UpdateWidgetData', (data) => {
-        this.mr.setData(data);
-      });
-
-      eventHub.$on('FetchActionsContent', () => {
-        this.fetchActionsContent();
-      });
-
-      eventHub.$on('EnablePolling', () => {
-        this.resumePolling();
-      });
-
-      eventHub.$on('DisablePolling', () => {
-        this.stopPolling();
-      });
-    },
-    handleMounted() {
-      this.setFaviconHelper();
-      this.initDeploymentsPolling();
-    },
-  },
-  created() {
-    this.initPolling();
-    this.bindEventHubListeners();
-  },
-  mounted() {
-    this.handleMounted();
-  },
-  components: {
-    'mr-widget-header': WidgetHeader,
-    'mr-widget-merge-help': WidgetMergeHelp,
-    'mr-widget-pipeline': WidgetPipeline,
-    Deployment,
-    'mr-widget-maintainer-edit': WidgetMaintainerEdit,
-    'mr-widget-related-links': WidgetRelatedLinks,
-    'mr-widget-merged': MergedState,
-    'mr-widget-closed': ClosedState,
-    'mr-widget-merging': MergingState,
-    'mr-widget-failed-to-merge': FailedToMerge,
-    'mr-widget-wip': WorkInProgressState,
-    'mr-widget-archived': ArchivedState,
-    'mr-widget-conflicts': ConflictsState,
-    'mr-widget-nothing-to-merge': NothingToMergeState,
-    'mr-widget-not-allowed': NotAllowedState,
-    'mr-widget-missing-branch': MissingBranchState,
-    'mr-widget-ready-to-merge': ReadyToMergeState,
-    'mr-widget-sha-mismatch': ShaMismatchState,
-    'mr-widget-squash-before-merge': SquashBeforeMerge,
-    'mr-widget-checking': CheckingState,
-    'mr-widget-unresolved-discussions': UnresolvedDiscussionsState,
-    'mr-widget-pipeline-blocked': PipelineBlockedState,
-    'mr-widget-pipeline-failed': PipelineFailedState,
-    'mr-widget-merge-when-pipeline-succeeds': MergeWhenPipelineSucceedsState,
-    'mr-widget-auto-merge-failed': AutoMergeFailed,
-    'mr-widget-rebase': RebaseState,
-    SourceBranchRemovalStatus,
-  },
-  template: `
-    <div class="mr-state-widget prepend-top-default">
-      <mr-widget-header :mr="mr" />
-      <mr-widget-pipeline
-        v-if="shouldRenderPipelines"
-        :pipeline="mr.pipeline"
-        :ci-status="mr.ciStatus"
-        :has-ci="mr.hasCI"
-        />
-      <deployment
-        v-for="deployment in mr.deployments"
-        :key="deployment.id"
-        :deployment="deployment"
-      />
-      <div class="mr-widget-section">
-        <component
-          :is="componentName"
-          :mr="mr"
-          :service="service" />
-        <mr-widget-maintainer-edit
-          :maintainerEditAllowed="mr.maintainerEditAllowed" />
-        <mr-widget-related-links
-          v-if="shouldRenderRelatedLinks"
-          :state="mr.state"
-          :related-links="mr.relatedLinks" />
-        <source-branch-removal-status
-          v-if="shouldRenderSourceBranchRemovalStatus"
-        />
-      </div>
-      <div
-        class="mr-widget-footer"
-        v-if="shouldRenderMergeHelp">
-        <mr-widget-merge-help />
-      </div>
-    </div>
-  `,
-};
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
new file mode 100644
index 00000000000..53b14664625
--- /dev/null
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
@@ -0,0 +1,290 @@
+<script>
+
+import Project from '~/pages/projects/project';
+import SmartInterval from '~/smart_interval';
+import createFlash from '../flash';
+import {
+  WidgetHeader,
+  WidgetMergeHelp,
+  WidgetPipeline,
+  Deployment,
+  WidgetRelatedLinks,
+  MergedState,
+  ClosedState,
+  MergingState,
+  RebaseState,
+  WorkInProgressState,
+  ArchivedState,
+  ConflictsState,
+  NothingToMergeState,
+  MissingBranchState,
+  NotAllowedState,
+  ReadyToMergeState,
+  ShaMismatchState,
+  UnresolvedDiscussionsState,
+  PipelineBlockedState,
+  PipelineFailedState,
+  FailedToMerge,
+  MergeWhenPipelineSucceedsState,
+  AutoMergeFailed,
+  CheckingState,
+  MRWidgetStore,
+  MRWidgetService,
+  eventHub,
+  stateMaps,
+  SquashBeforeMerge,
+  notify,
+  SourceBranchRemovalStatus,
+} from './dependencies';
+import { setFavicon } from '../lib/utils/common_utils';
+
+export default {
+  el: '#js-vue-mr-widget',
+  name: 'MRWidget',
+  props: {
+    mrData: {
+      type: Object,
+      required: false,
+    },
+  },
+  data() {
+    const store = new MRWidgetStore(this.mrData || window.gl.mrWidgetData);
+    const service = this.createService(store);
+    return {
+      mr: store,
+      service,
+    };
+  },
+  computed: {
+    componentName() {
+      return stateMaps.stateToComponentMap[this.mr.state];
+    },
+    shouldRenderMergeHelp() {
+      return stateMaps.statesToShowHelpWidget.indexOf(this.mr.state) > -1;
+    },
+    shouldRenderPipelines() {
+      return this.mr.hasCI;
+    },
+    shouldRenderRelatedLinks() {
+      return !!this.mr.relatedLinks && !this.mr.isNothingToMergeState;
+    },
+    shouldRenderSourceBranchRemovalStatus() {
+      return !this.mr.canRemoveSourceBranch && this.mr.shouldRemoveSourceBranch &&
+        (!this.mr.isNothingToMergeState && !this.mr.isMergedState);
+    },
+  },
+  methods: {
+    createService(store) {
+      const endpoints = {
+        mergePath: store.mergePath,
+        mergeCheckPath: store.mergeCheckPath,
+        cancelAutoMergePath: store.cancelAutoMergePath,
+        removeWIPPath: store.removeWIPPath,
+        sourceBranchPath: store.sourceBranchPath,
+        ciEnvironmentsStatusPath: store.ciEnvironmentsStatusPath,
+        statusPath: store.statusPath,
+        mergeActionsContentPath: store.mergeActionsContentPath,
+        rebasePath: store.rebasePath,
+      };
+      return new MRWidgetService(endpoints);
+    },
+    checkStatus(cb) {
+      return this.service.checkStatus()
+        .then(res => res.data)
+        .then((data) => {
+          this.handleNotification(data);
+          this.mr.setData(data);
+          this.setFaviconHelper();
+
+          if (cb) {
+            cb.call(null, data);
+          }
+        })
+        .catch(() => createFlash('Something went wrong. Please try again.'));
+    },
+    initPolling() {
+      this.pollingInterval = new SmartInterval({
+        callback: this.checkStatus,
+        startingInterval: 10000,
+        maxInterval: 30000,
+        hiddenInterval: 120000,
+        incrementByFactorOf: 5000,
+      });
+    },
+    initDeploymentsPolling() {
+      this.deploymentsInterval = new SmartInterval({
+        callback: this.fetchDeployments,
+        startingInterval: 30000,
+        maxInterval: 120000,
+        hiddenInterval: 240000,
+        incrementByFactorOf: 15000,
+        immediateExecution: true,
+      });
+    },
+    setFaviconHelper() {
+      if (this.mr.ciStatusFaviconPath) {
+        setFavicon(this.mr.ciStatusFaviconPath);
+      }
+    },
+    fetchDeployments() {
+      return this.service.fetchDeployments()
+        .then(res => res.data)
+        .then((data) => {
+          if (data.length) {
+            this.mr.deployments = data;
+          }
+        })
+        .catch(() => {
+          createFlash('Something went wrong while fetching the environments for this merge request. Please try again.'); // eslint-disable-line
+        });
+    },
+    fetchActionsContent() {
+      this.service.fetchMergeActionsContent()
+        .then((res) => {
+          if (res.data) {
+            const el = document.createElement('div');
+            el.innerHTML = res.data;
+            document.body.appendChild(el);
+            Project.initRefSwitcher();
+          }
+        })
+        .catch(() => createFlash('Something went wrong. Please try again.'));
+    },
+    handleNotification(data) {
+      if (data.ci_status === this.mr.ciStatus) return;
+      if (!data.pipeline) return;
+
+      const label = data.pipeline.details.status.label;
+      const title = `Pipeline ${label}`;
+      const message = `Pipeline ${label} for "${data.title}"`;
+
+      notify.notifyMe(title, message, this.mr.gitlabLogo);
+    },
+    resumePolling() {
+      this.pollingInterval.resume();
+    },
+    stopPolling() {
+      this.pollingInterval.stopTimer();
+    },
+    bindEventHubListeners() {
+      eventHub.$on('MRWidgetUpdateRequested', (cb) => {
+        this.checkStatus(cb);
+      });
+
+      // `params` should be an Array contains a Boolean, like `[true]`
+      // Passing parameter as Boolean didn't work.
+      eventHub.$on('SetBranchRemoveFlag', (params) => {
+        this.mr.isRemovingSourceBranch = params[0];
+      });
+
+      eventHub.$on('FailedToMerge', (mergeError) => {
+        this.mr.state = 'failedToMerge';
+        this.mr.mergeError = mergeError;
+      });
+
+      eventHub.$on('UpdateWidgetData', (data) => {
+        this.mr.setData(data);
+      });
+
+      eventHub.$on('FetchActionsContent', () => {
+        this.fetchActionsContent();
+      });
+
+      eventHub.$on('EnablePolling', () => {
+        this.resumePolling();
+      });
+
+      eventHub.$on('DisablePolling', () => {
+        this.stopPolling();
+      });
+    },
+    handleMounted() {
+      this.setFaviconHelper();
+      this.initDeploymentsPolling();
+    },
+  },
+  created() {
+    this.initPolling();
+    this.bindEventHubListeners();
+  },
+  mounted() {
+    this.handleMounted();
+  },
+  components: {
+    'mr-widget-header': WidgetHeader,
+    'mr-widget-merge-help': WidgetMergeHelp,
+    'mr-widget-pipeline': WidgetPipeline,
+    Deployment,
+    'mr-widget-related-links': WidgetRelatedLinks,
+    'mr-widget-merged': MergedState,
+    'mr-widget-closed': ClosedState,
+    'mr-widget-merging': MergingState,
+    'mr-widget-failed-to-merge': FailedToMerge,
+    'mr-widget-wip': WorkInProgressState,
+    'mr-widget-archived': ArchivedState,
+    'mr-widget-conflicts': ConflictsState,
+    'mr-widget-nothing-to-merge': NothingToMergeState,
+    'mr-widget-not-allowed': NotAllowedState,
+    'mr-widget-missing-branch': MissingBranchState,
+    'mr-widget-ready-to-merge': ReadyToMergeState,
+    'sha-mismatch': ShaMismatchState,
+    'mr-widget-squash-before-merge': SquashBeforeMerge,
+    'mr-widget-checking': CheckingState,
+    'mr-widget-unresolved-discussions': UnresolvedDiscussionsState,
+    'mr-widget-pipeline-blocked': PipelineBlockedState,
+    'mr-widget-pipeline-failed': PipelineFailedState,
+    'mr-widget-merge-when-pipeline-succeeds': MergeWhenPipelineSucceedsState,
+    'mr-widget-auto-merge-failed': AutoMergeFailed,
+    'mr-widget-rebase': RebaseState,
+    SourceBranchRemovalStatus,
+  },
+};
+</script>
+<template>
+  <div class="mr-state-widget prepend-top-default">
+    <mr-widget-header
+      :mr="mr"
+    />
+    <mr-widget-pipeline
+      v-if="shouldRenderPipelines"
+      :pipeline="mr.pipeline"
+      :ci-status="mr.ciStatus"
+      :has-ci="mr.hasCI"
+    />
+    <deployment
+      v-for="deployment in mr.deployments"
+      :key="deployment.id"
+      :deployment="deployment"
+    />
+    <div class="mr-widget-section">
+      <component
+        :is="componentName"
+        :mr="mr"
+        :service="service"
+      />
+
+      <section
+        v-if="mr.maintainerEditAllowed"
+        class="mr-info-list mr-links"
+      >
+        {{ s__("mrWidget|Allows edits from maintainers") }}
+      </section>
+
+      <mr-widget-related-links
+        v-if="shouldRenderRelatedLinks"
+        :state="mr.state"
+        :related-links="mr.relatedLinks"
+      />
+
+      <source-branch-removal-status
+        v-if="shouldRenderSourceBranchRemovalStatus"
+      />
+    </div>
+    <div
+      class="mr-widget-footer"
+      v-if="shouldRenderMergeHelp"
+    >
+      <mr-widget-merge-help />
+    </div>
+  </div>
+</template>
\ No newline at end of file
-- 
cgit v1.2.1


From ece350218405a10495912a94863fd29d3ebe3da3 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 10 May 2018 18:08:52 +0100
Subject: Fixes eslint

---
 .../vue_merge_request_widget/mr_widget_options.vue | 73 +++++++++++-----------
 1 file changed, 37 insertions(+), 36 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
index 53b14664625..b03f22607e5 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
@@ -41,10 +41,39 @@ import { setFavicon } from '../lib/utils/common_utils';
 export default {
   el: '#js-vue-mr-widget',
   name: 'MRWidget',
+  components: {
+    'mr-widget-header': WidgetHeader,
+    'mr-widget-merge-help': WidgetMergeHelp,
+    'mr-widget-pipeline': WidgetPipeline,
+    Deployment,
+    'mr-widget-related-links': WidgetRelatedLinks,
+    'mr-widget-merged': MergedState,
+    'mr-widget-closed': ClosedState,
+    'mr-widget-merging': MergingState,
+    'mr-widget-failed-to-merge': FailedToMerge,
+    'mr-widget-wip': WorkInProgressState,
+    'mr-widget-archived': ArchivedState,
+    'mr-widget-conflicts': ConflictsState,
+    'mr-widget-nothing-to-merge': NothingToMergeState,
+    'mr-widget-not-allowed': NotAllowedState,
+    'mr-widget-missing-branch': MissingBranchState,
+    'mr-widget-ready-to-merge': ReadyToMergeState,
+    'sha-mismatch': ShaMismatchState,
+    'mr-widget-squash-before-merge': SquashBeforeMerge,
+    'mr-widget-checking': CheckingState,
+    'mr-widget-unresolved-discussions': UnresolvedDiscussionsState,
+    'mr-widget-pipeline-blocked': PipelineBlockedState,
+    'mr-widget-pipeline-failed': PipelineFailedState,
+    'mr-widget-merge-when-pipeline-succeeds': MergeWhenPipelineSucceedsState,
+    'mr-widget-auto-merge-failed': AutoMergeFailed,
+    'mr-widget-rebase': RebaseState,
+    SourceBranchRemovalStatus,
+  },
   props: {
     mrData: {
       type: Object,
       required: false,
+      default: () => ({}),
     },
   },
   data() {
@@ -73,6 +102,13 @@ export default {
         (!this.mr.isNothingToMergeState && !this.mr.isMergedState);
     },
   },
+  created() {
+    this.initPolling();
+    this.bindEventHubListeners();
+  },
+  mounted() {
+    this.handleMounted();
+  },
   methods: {
     createService(store) {
       const endpoints = {
@@ -203,41 +239,6 @@ export default {
       this.initDeploymentsPolling();
     },
   },
-  created() {
-    this.initPolling();
-    this.bindEventHubListeners();
-  },
-  mounted() {
-    this.handleMounted();
-  },
-  components: {
-    'mr-widget-header': WidgetHeader,
-    'mr-widget-merge-help': WidgetMergeHelp,
-    'mr-widget-pipeline': WidgetPipeline,
-    Deployment,
-    'mr-widget-related-links': WidgetRelatedLinks,
-    'mr-widget-merged': MergedState,
-    'mr-widget-closed': ClosedState,
-    'mr-widget-merging': MergingState,
-    'mr-widget-failed-to-merge': FailedToMerge,
-    'mr-widget-wip': WorkInProgressState,
-    'mr-widget-archived': ArchivedState,
-    'mr-widget-conflicts': ConflictsState,
-    'mr-widget-nothing-to-merge': NothingToMergeState,
-    'mr-widget-not-allowed': NotAllowedState,
-    'mr-widget-missing-branch': MissingBranchState,
-    'mr-widget-ready-to-merge': ReadyToMergeState,
-    'sha-mismatch': ShaMismatchState,
-    'mr-widget-squash-before-merge': SquashBeforeMerge,
-    'mr-widget-checking': CheckingState,
-    'mr-widget-unresolved-discussions': UnresolvedDiscussionsState,
-    'mr-widget-pipeline-blocked': PipelineBlockedState,
-    'mr-widget-pipeline-failed': PipelineFailedState,
-    'mr-widget-merge-when-pipeline-succeeds': MergeWhenPipelineSucceedsState,
-    'mr-widget-auto-merge-failed': AutoMergeFailed,
-    'mr-widget-rebase': RebaseState,
-    SourceBranchRemovalStatus,
-  },
 };
 </script>
 <template>
@@ -287,4 +288,4 @@ export default {
       <mr-widget-merge-help />
     </div>
   </div>
-</template>
\ No newline at end of file
+</template>
-- 
cgit v1.2.1


From feb9caab9033262ccd93ae881f095bbfd73904ad Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 11 May 2018 14:03:27 +0000
Subject: Resolve "Remove modal box confirmation when retrying a pipeline"

---
 .../pipelines/components/async_button.vue          | 95 ---------------------
 .../pipelines/components/pipelines_table.vue       | 53 ++++--------
 .../pipelines/components/pipelines_table_row.vue   | 96 ++++++++++++++--------
 .../javascripts/pipelines/mixins/pipelines.js      |  2 +
 .../vue_shared/components/loading_button.vue       | 14 ++--
 5 files changed, 88 insertions(+), 172 deletions(-)
 delete mode 100644 app/assets/javascripts/pipelines/components/async_button.vue

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/pipelines/components/async_button.vue b/app/assets/javascripts/pipelines/components/async_button.vue
deleted file mode 100644
index 0cdffbde05b..00000000000
--- a/app/assets/javascripts/pipelines/components/async_button.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<script>
-  /* eslint-disable no-alert */
-
-  import eventHub from '../event_hub';
-  import loadingIcon from '../../vue_shared/components/loading_icon.vue';
-  import icon from '../../vue_shared/components/icon.vue';
-  import tooltip from '../../vue_shared/directives/tooltip';
-
-  export default {
-    directives: {
-      tooltip,
-    },
-    components: {
-      loadingIcon,
-      icon,
-    },
-    props: {
-      endpoint: {
-        type: String,
-        required: true,
-      },
-      title: {
-        type: String,
-        required: true,
-      },
-      icon: {
-        type: String,
-        required: true,
-      },
-      cssClass: {
-        type: String,
-        required: true,
-      },
-      pipelineId: {
-        type: Number,
-        required: true,
-      },
-      type: {
-        type: String,
-        required: true,
-      },
-    },
-    data() {
-      return {
-        isLoading: false,
-      };
-    },
-    computed: {
-      buttonClass() {
-        return `btn ${this.cssClass}`;
-      },
-    },
-    created() {
-      // We're using eventHub to listen to the modal here instead of
-      // using props because it would would make the parent components
-      // much more complex to keep track of the loading state of each button
-      eventHub.$on('postAction', this.setLoading);
-    },
-    beforeDestroy() {
-      eventHub.$off('postAction', this.setLoading);
-    },
-    methods: {
-      onClick() {
-        eventHub.$emit('openConfirmationModal', {
-          pipelineId: this.pipelineId,
-          endpoint: this.endpoint,
-          type: this.type,
-        });
-      },
-      setLoading(endpoint) {
-        if (endpoint === this.endpoint) {
-          this.isLoading = true;
-        }
-      },
-    },
-  };
-</script>
-
-<template>
-  <button
-    v-tooltip
-    type="button"
-    @click="onClick"
-    :class="buttonClass"
-    :title="title"
-    :aria-label="title"
-    data-container="body"
-    data-placement="top"
-    :disabled="isLoading">
-    <icon
-      :name="icon"
-    />
-    <loading-icon v-if="isLoading" />
-  </button>
-</template>
diff --git a/app/assets/javascripts/pipelines/components/pipelines_table.vue b/app/assets/javascripts/pipelines/components/pipelines_table.vue
index 714aed1333e..41986b827cd 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_table.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_table.vue
@@ -1,7 +1,7 @@
 <script>
-  import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
+  import Modal from '~/vue_shared/components/gl_modal.vue';
   import { s__, sprintf } from '~/locale';
-  import pipelinesTableRowComponent from './pipelines_table_row.vue';
+  import PipelinesTableRowComponent from './pipelines_table_row.vue';
   import eventHub from '../event_hub';
 
   /**
@@ -11,8 +11,8 @@
    */
   export default {
     components: {
-      pipelinesTableRowComponent,
-      DeprecatedModal,
+      PipelinesTableRowComponent,
+      Modal,
     },
     props: {
       pipelines: {
@@ -37,30 +37,18 @@
       return {
         pipelineId: '',
         endpoint: '',
-        type: '',
       };
     },
     computed: {
       modalTitle() {
-        return this.type === 'stop' ?
-          sprintf(s__('Pipeline|Stop pipeline #%{pipelineId}?'), {
-            pipelineId: `'${this.pipelineId}'`,
-          }, false) :
-          sprintf(s__('Pipeline|Retry pipeline #%{pipelineId}?'), {
-            pipelineId: `'${this.pipelineId}'`,
-          }, false);
+        return sprintf(s__('Pipeline|Stop pipeline #%{pipelineId}?'), {
+          pipelineId: `${this.pipelineId}`,
+        }, false);
       },
       modalText() {
-        return this.type === 'stop' ?
-          sprintf(s__('Pipeline|You’re about to stop pipeline %{pipelineId}.'), {
-            pipelineId: `<strong>#${this.pipelineId}</strong>`,
-          }, false) :
-          sprintf(s__('Pipeline|You’re about to retry pipeline %{pipelineId}.'), {
-            pipelineId: `<strong>#${this.pipelineId}</strong>`,
-          }, false);
-      },
-      primaryButtonLabel() {
-        return this.type === 'stop' ? s__('Pipeline|Stop pipeline') : s__('Pipeline|Retry pipeline');
+        return sprintf(s__('Pipeline|You’re about to stop pipeline %{pipelineId}.'), {
+          pipelineId: `<strong>#${this.pipelineId}</strong>`,
+        }, false);
       },
     },
     created() {
@@ -73,7 +61,6 @@
       setModalData(data) {
         this.pipelineId = data.pipelineId;
         this.endpoint = data.endpoint;
-        this.type = data.type;
       },
       onSubmit() {
         eventHub.$emit('postAction', this.endpoint);
@@ -120,20 +107,16 @@
       :auto-devops-help-path="autoDevopsHelpPath"
       :view-type="viewType"
     />
-    <deprecated-modal
+
+    <modal
       id="confirmation-modal"
-      :title="modalTitle"
-      :text="modalText"
-      kind="danger"
-      :primary-button-label="primaryButtonLabel"
+      :header-title-text="modalTitle"
+      footer-primary-button-variant="danger"
+      :footer-primary-button-text="s__('Pipeline|Stop pipeline')"
       @submit="onSubmit"
     >
-      <template
-        slot="body"
-        slot-scope="props"
-      >
-        <p v-html="props.text"></p>
-      </template>
-    </deprecated-modal>
+      <span v-html="modalText"></span>
+    </modal>
+
   </div>
 </template>
diff --git a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
index 4cbd67e0372..498a97851fa 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
@@ -1,13 +1,14 @@
 <script>
-  /* eslint-disable no-param-reassign */
-  import asyncButtonComponent from './async_button.vue';
-  import pipelinesActionsComponent from './pipelines_actions.vue';
-  import pipelinesArtifactsComponent from './pipelines_artifacts.vue';
-  import ciBadge from '../../vue_shared/components/ci_badge_link.vue';
-  import pipelineStage from './stage.vue';
-  import pipelineUrl from './pipeline_url.vue';
-  import pipelinesTimeago from './time_ago.vue';
-  import commitComponent from '../../vue_shared/components/commit.vue';
+  import eventHub from '../event_hub';
+  import PipelinesActionsComponent from './pipelines_actions.vue';
+  import PipelinesArtifactsComponent from './pipelines_artifacts.vue';
+  import CiBadge from '../../vue_shared/components/ci_badge_link.vue';
+  import PipelineStage from './stage.vue';
+  import PipelineUrl from './pipeline_url.vue';
+  import PipelinesTimeago from './time_ago.vue';
+  import CommitComponent from '../../vue_shared/components/commit.vue';
+  import LoadingButton from '../../vue_shared/components/loading_button.vue';
+  import Icon from '../../vue_shared/components/icon.vue';
 
   /**
    * Pipeline table row.
@@ -16,14 +17,15 @@
    */
   export default {
     components: {
-      asyncButtonComponent,
-      pipelinesActionsComponent,
-      pipelinesArtifactsComponent,
-      commitComponent,
-      pipelineStage,
-      pipelineUrl,
-      ciBadge,
-      pipelinesTimeago,
+      PipelinesActionsComponent,
+      PipelinesArtifactsComponent,
+      CommitComponent,
+      PipelineStage,
+      PipelineUrl,
+      CiBadge,
+      PipelinesTimeago,
+      LoadingButton,
+      Icon,
     },
     props: {
       pipeline: {
@@ -44,6 +46,12 @@
         required: true,
       },
     },
+    data() {
+      return {
+        isRetrying: false,
+        isCancelling: false,
+      };
+    },
     computed: {
       /**
        * If provided, returns the commit tag.
@@ -119,8 +127,10 @@
         if (this.pipeline.ref) {
           return Object.keys(this.pipeline.ref).reduce((accumulator, prop) => {
             if (prop === 'path') {
+              // eslint-disable-next-line no-param-reassign
               accumulator.ref_url = this.pipeline.ref[prop];
             } else {
+              // eslint-disable-next-line no-param-reassign
               accumulator[prop] = this.pipeline.ref[prop];
             }
             return accumulator;
@@ -216,6 +226,21 @@
         return this.viewType === 'child';
       },
     },
+
+    methods: {
+      handleCancelClick() {
+        this.isCancelling = true;
+
+        eventHub.$emit('openConfirmationModal', {
+          pipelineId: this.pipeline.id,
+          endpoint: this.pipeline.cancel_path,
+        });
+      },
+      handleRetryClick() {
+        this.isRetrying = true;
+        eventHub.$emit('retryPipeline', this.pipeline.retry_path);
+      },
+    },
   };
 </script>
 <template>
@@ -287,7 +312,8 @@
 
     <div
       v-if="displayPipelineActions"
-      class="table-section section-20 table-button-footer pipeline-actions">
+      class="table-section section-20 table-button-footer pipeline-actions"
+    >
       <div class="btn-group table-action-buttons">
         <pipelines-actions-component
           v-if="pipeline.details.manual_actions.length"
@@ -300,29 +326,27 @@
           :artifacts="pipeline.details.artifacts"
         />
 
-        <async-button-component
+        <loading-button
           v-if="pipeline.flags.retryable"
-          :endpoint="pipeline.retry_path"
-          css-class="js-pipelines-retry-button btn-default btn-retry"
-          title="Retry"
-          icon="repeat"
-          :pipeline-id="pipeline.id"
-          data-toggle="modal"
-          data-target="#confirmation-modal"
-          type="retry"
-        />
+          @click="handleRetryClick"
+          container-class="js-pipelines-retry-button btn btn-default btn-retry"
+          :loading="isRetrying"
+          :disabled="isRetrying"
+        >
+          <icon name="repeat" />
+        </loading-button>
 
-        <async-button-component
+        <loading-button
           v-if="pipeline.flags.cancelable"
-          :endpoint="pipeline.cancel_path"
-          css-class="js-pipelines-cancel-button btn-remove"
-          title="Stop"
-          icon="close"
-          :pipeline-id="pipeline.id"
+          @click="handleCancelClick"
           data-toggle="modal"
           data-target="#confirmation-modal"
-          type="stop"
-        />
+          container-class="js-pipelines-cancel-button btn btn-remove"
+          :loading="isCancelling"
+          :disabled="isCancelling"
+        >
+          <icon name="close" />
+        </loading-button>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/pipelines/mixins/pipelines.js b/app/assets/javascripts/pipelines/mixins/pipelines.js
index 6d87f75ae8e..de0faf181e5 100644
--- a/app/assets/javascripts/pipelines/mixins/pipelines.js
+++ b/app/assets/javascripts/pipelines/mixins/pipelines.js
@@ -53,10 +53,12 @@ export default {
     });
 
     eventHub.$on('postAction', this.postAction);
+    eventHub.$on('retryPipeline', this.postAction);
     eventHub.$on('clickedDropdown', this.updateTable);
   },
   beforeDestroy() {
     eventHub.$off('postAction', this.postAction);
+    eventHub.$off('retryPipeline', this.postAction);
     eventHub.$off('clickedDropdown', this.updateTable);
   },
   destroyed() {
diff --git a/app/assets/javascripts/vue_shared/components/loading_button.vue b/app/assets/javascripts/vue_shared/components/loading_button.vue
index e832d94d32f..88c13a1f340 100644
--- a/app/assets/javascripts/vue_shared/components/loading_button.vue
+++ b/app/assets/javascripts/vue_shared/components/loading_button.vue
@@ -70,12 +70,14 @@
       />
     </transition>
     <transition name="fade">
-      <span
-        v-if="label"
-        class="js-loading-button-label"
-      >
-        {{ label }}
-      </span>
+      <slot>
+        <span
+          v-if="label"
+          class="js-loading-button-label"
+        >
+          {{ label }}
+        </span>
+      </slot>
     </transition>
   </button>
 </template>
-- 
cgit v1.2.1


From 9c8129267117985996a9ccb958072c7705ecfe62 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 11 May 2018 17:46:27 +0100
Subject: Fix broken tests

---
 app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
index b03f22607e5..f69fe03fcb3 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
@@ -73,7 +73,7 @@ export default {
     mrData: {
       type: Object,
       required: false,
-      default: () => ({}),
+      default: null,
     },
   },
   data() {
-- 
cgit v1.2.1


From 4c4110efe162e80f37d6be6087fac597d8320626 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 15 May 2018 14:07:56 +0000
Subject: Remote table-section from div holding cluster error messages

---
 app/assets/javascripts/clusters/components/application_row.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index c2a35341eb2..40cafb54606 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -179,7 +179,7 @@
       role="row"
     >
       <div
-        class="alert alert-danger alert-block append-bottom-0 table-section section-100"
+        class="alert alert-danger alert-block append-bottom-0 section-100"
         role="gridcell"
       >
         <div>
-- 
cgit v1.2.1


From 207a38d014bcc9cafd76c863fe3f200f60e073fa Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 16 May 2018 07:28:34 +0000
Subject: Remove unnecessary section-100 css class from application_row.vue

---
 app/assets/javascripts/clusters/components/application_row.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index 40cafb54606..fae580c091b 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -179,7 +179,7 @@
       role="row"
     >
       <div
-        class="alert alert-danger alert-block append-bottom-0 section-100"
+        class="alert alert-danger alert-block append-bottom-0"
         role="gridcell"
       >
         <div>
-- 
cgit v1.2.1


From e6cbf40263ccf160cc97216e395e5c8ede8d13d2 Mon Sep 17 00:00:00 2001
From: Lars Greiss <l.greiss@mediacologne.de>
Date: Wed, 16 May 2018 10:19:41 +0000
Subject: Remove docker pull prefix from registry clipboard feature

---
 .../javascripts/registry/components/collapsible_container.vue      | 7 +------
 app/assets/javascripts/registry/components/table_registry.vue      | 6 +-----
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/registry/components/collapsible_container.vue b/app/assets/javascripts/registry/components/collapsible_container.vue
index a03180e80e6..2ce43ef0125 100644
--- a/app/assets/javascripts/registry/components/collapsible_container.vue
+++ b/app/assets/javascripts/registry/components/collapsible_container.vue
@@ -28,11 +28,6 @@
         isOpen: false,
       };
     },
-    computed: {
-      clipboardText() {
-        return `docker pull ${this.repo.location}`;
-      },
-    },
     methods: {
       ...mapActions([
         'fetchRepos',
@@ -84,7 +79,7 @@
 
       <clipboard-button
         v-if="repo.location"
-        :text="clipboardText"
+        :text="repo.location"
         :title="repo.location"
         css-class="btn-default btn-transparent btn-clipboard"
       />
diff --git a/app/assets/javascripts/registry/components/table_registry.vue b/app/assets/javascripts/registry/components/table_registry.vue
index a2227b2f554..673b1db6769 100644
--- a/app/assets/javascripts/registry/components/table_registry.vue
+++ b/app/assets/javascripts/registry/components/table_registry.vue
@@ -56,10 +56,6 @@
           .catch(() => this.showError(errorMessagesTypes.FETCH_REGISTRY));
       },
 
-      clipboardText(text) {
-        return `docker pull ${text}`;
-      },
-
       showError(message) {
         Flash(errorMessages[message]);
       },
@@ -89,7 +85,7 @@
             <clipboard-button
               v-if="item.location"
               :title="item.location"
-              :text="clipboardText(item.location)"
+              :text="item.location"
               css-class="btn-default btn-transparent btn-clipboard"
             />
           </td>
-- 
cgit v1.2.1