Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 1 deletions

diff --git a/app/assets/javascripts/repository/components/preview/index.vue b/app/assets/javascripts/repository/components/preview/index.vue
index 2bc93c3f1c1..78ae719ba0d 100644
--- a/app/assets/javascripts/repository/components/preview/index.vue
+++ b/app/assets/javascripts/repository/components/preview/index.vue
@@ -1,4 +1,6 @@
 <script>
+import $ from 'jquery';
+import '~/behaviors/markdown/render_gfm';
 import { GlLink, GlLoadingIcon } from '@gitlab/ui';
 import getReadmeQuery from '../../queries/getReadme.query.graphql';
 
@@ -30,6 +32,15 @@ export default {
       loading: 0,
     };
   },
+  watch: {
+    readme(newVal) {
+      if (newVal) {
+        this.$nextTick(() => {
+          $(this.$refs.readme).renderGFM();
+        });
+      }
+    },
+  },
 };
 </script>
 
@@ -45,7 +56,7 @@ export default {
     </div>
     <div class="blob-viewer">
       <gl-loading-icon v-if="loading > 0" size="md" color="dark" class="my-4 mx-auto" />
-      <div v-else-if="readme" v-html="readme.html"></div>
+      <div v-else-if="readme" ref="readme" v-html="readme.html"></div>
     </div>
   </article>
 </template>