Automatic merge of gitlab-org/gitlab-ce master

.gitlab/ci/review.gitlab-ci.yml

@@ -74,11 +74,10 @@ schedule:review-build-cng:
     - .review-schedules-only
   needs: ["gitlab:assets:compile"]
 
-review-deploy:
+.review-deploy-base:
   extends: .review-base
   allow_failure: true
   stage: review
-  needs: ["review-build-cng"]
   variables:
     HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
     DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
@@ -108,10 +107,16 @@ review-deploy:
     expire_in: 2 days
     when: always
 
+review-deploy:
+  extends:
+    - .review-deploy-base
+  needs: ["review-build-cng"]
+
 schedule:review-deploy:
   extends:
-    - review-deploy
+    - .review-deploy-base
     - .review-schedules-only
+  needs: ["schedule:review-build-cng"]
 
 review-stop:
   extends: review-deploy

app/assets/javascripts/blob/viewer/index.js

 import $ from 'jquery';
+import '~/behaviors/markdown/render_gfm';
 import Flash from '../../flash';
 import { handleLocationHash } from '../../lib/utils/common_utils';
 import axios from '../../lib/utils/axios_utils';
@@ -105,7 +106,6 @@ export default class BlobViewer {
 
   toggleCopyButtonState() {
     if (!this.copySourceBtn) return;
-
     if (this.simpleViewer.getAttribute('data-loaded')) {
       this.copySourceBtn.setAttribute('title', __('Copy source to clipboard'));
       this.copySourceBtn.classList.remove('disabled');
@@ -152,7 +152,6 @@ export default class BlobViewer {
     this.activeViewer = newViewer;
 
     this.toggleCopyButtonState();
-
     BlobViewer.loadViewer(newViewer)
       .then(viewer => {
         $(viewer).renderGFM();

app/assets/javascripts/notes/components/note_body.vue

 <script>
 import { mapActions } from 'vuex';
 import $ from 'jquery';
+import '~/behaviors/markdown/render_gfm';
 import getDiscussion from 'ee_else_ce/notes/mixins/get_discussion';
 import noteEditedText from './note_edited_text.vue';
 import noteAwardsList from './note_awards_list.vue';

app/assets/javascripts/vue_shared/components/markdown/field.vue

 <script>
 import $ from 'jquery';
+import '~/behaviors/markdown/render_gfm';
 import _ from 'underscore';
 import { __, sprintf } from '~/locale';
 import { stripHtml } from '~/lib/utils/text_utility';