Add latest changes from gitlab-org/gitlab@master

3 files changed, 44 insertions, 30 deletions

diff --git a/app/assets/javascripts/snippets/components/show.vue b/app/assets/javascripts/snippets/components/show.vue
index e98f56d87f5..bc0034d397e 100644
--- a/app/assets/javascripts/snippets/components/show.vue
+++ b/app/assets/javascripts/snippets/components/show.vue
@@ -1,10 +1,11 @@
 <script>
-import GetSnippetQuery from '../queries/snippet.query.graphql';
 import SnippetHeader from './snippet_header.vue';
 import SnippetTitle from './snippet_title.vue';
 import SnippetBlob from './snippet_blob_view.vue';
 import { GlLoadingIcon } from '@gitlab/ui';
 
+import { getSnippetMixin } from '../mixins/snippets';
+
 export default {
   components: {
     SnippetHeader,
@@ -12,33 +13,7 @@ export default {
     GlLoadingIcon,
     SnippetBlob,
   },
-  apollo: {
-    snippet: {
-      query: GetSnippetQuery,
-      variables() {
-        return {
-          ids: this.snippetGid,
-        };
-      },
-      update: data => data.snippets.edges[0].node,
-    },
-  },
-  props: {
-    snippetGid: {
-      type: String,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      snippet: {},
-    };
-  },
-  computed: {
-    isLoading() {
-      return this.$apollo.queries.snippet.loading;
-    },
-  },
+  mixins: [getSnippetMixin],
 };
 </script>
 <template>
@@ -46,7 +21,7 @@ export default {
     <gl-loading-icon
       v-if="isLoading"
       :label="__('Loading snippet')"
-      :size="2"
+      size="lg"
       class="loading-animation prepend-top-20 append-bottom-20"
     />
     <template v-else>
diff --git a/app/assets/javascripts/snippets/components/snippet_blob_edit.vue b/app/assets/javascripts/snippets/components/snippet_blob_edit.vue
index ae6f451df18..44b4607e5a9 100644
--- a/app/assets/javascripts/snippets/components/snippet_blob_edit.vue
+++ b/app/assets/javascripts/snippets/components/snippet_blob_edit.vue
@@ -37,7 +37,7 @@ export default {
       <gl-loading-icon
         v-if="isLoading"
         :label="__('Loading snippet')"
-        :size="2"
+        size="lg"
         class="loading-animation prepend-top-20 append-bottom-20"
       />
       <blob-content-edit
diff --git a/app/assets/javascripts/snippets/mixins/snippets.js b/app/assets/javascripts/snippets/mixins/snippets.js
new file mode 100644
index 00000000000..837c41cdf6b
--- /dev/null
+++ b/app/assets/javascripts/snippets/mixins/snippets.js
@@ -0,0 +1,39 @@
+import GetSnippetQuery from '../queries/snippet.query.graphql';
+
+export const getSnippetMixin = {
+  apollo: {
+    snippet: {
+      query: GetSnippetQuery,
+      variables() {
+        return {
+          ids: this.snippetGid,
+        };
+      },
+      update: data => data.snippets.edges[0]?.node,
+      result(res) {
+        if (this.onSnippetFetch) {
+          this.onSnippetFetch(res);
+        }
+      },
+    },
+  },
+  props: {
+    snippetGid: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      snippet: {},
+      newSnippet: false,
+    };
+  },
+  computed: {
+    isLoading() {
+      return this.$apollo.queries.snippet.loading;
+    },
+  },
+};
+
+export default () => {};