Merge branch '11-6-stable-prepare-rc7' into '11-6-stable'

Prepare 11.6 RC7 release

See merge request gitlab-org/gitlab-ce!23761

11 files changed, 63 insertions, 12 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 898d740ed63..46604317232 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -555,8 +555,7 @@ docs lint:
     # Build HTML from Markdown
     - bundle exec nanoc
     # Check the internal links
-    # Disabled until https://gitlab.com/gitlab-com/gitlab-docs/issues/305 is resolved
-    # - bundle exec nanoc check internal_links
+    - bundle exec nanoc check internal_links
 
 downtime_check:
   <<: *rake-exec
diff --git a/app/assets/javascripts/issuable_suggestions/components/app.vue b/app/assets/javascripts/issuable_suggestions/components/app.vue
index eea0701312b..575c860851c 100644
--- a/app/assets/javascripts/issuable_suggestions/components/app.vue
+++ b/app/assets/javascripts/issuable_suggestions/components/app.vue
@@ -27,7 +27,7 @@ export default {
   apollo: {
     issues: {
       query,
-      debounce: 250,
+      debounce: 1000,
       skip() {
         return this.isSearchEmpty;
       },
diff --git a/app/assets/javascripts/notes/components/notes_app.vue b/app/assets/javascripts/notes/components/notes_app.vue
index 6e6efb04753..0a87cd7ef1f 100644
--- a/app/assets/javascripts/notes/components/notes_app.vue
+++ b/app/assets/javascripts/notes/components/notes_app.vue
@@ -101,7 +101,7 @@ export default {
     if (parentElement && parentElement.classList.contains('js-vue-notes-event')) {
       parentElement.addEventListener('toggleAward', event => {
         const { awardName, noteId } = event.detail;
-        this.actionToggleAward({ awardName, noteId });
+        this.toggleAward({ awardName, noteId });
       });
     }
   },
diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue
index 21d6519191f..43def2673eb 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/field.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue
@@ -1,6 +1,6 @@
 <script>
 import $ from 'jquery';
-import { s__ } from '~/locale';
+import { __ } from '~/locale';
 import Flash from '../../../flash';
 import GLForm from '../../../gl_form';
 import markdownHeader from './header.vue';
@@ -99,11 +99,12 @@ export default {
 
       if (text) {
         this.markdownPreviewLoading = true;
+        this.markdownPreview = __('Loading…');
         this.$http
           .post(this.versionedPreviewPath(), { text })
           .then(resp => resp.json())
           .then(data => this.renderMarkdown(data))
-          .catch(() => new Flash(s__('Error loading markdown preview')));
+          .catch(() => new Flash(__('Error loading markdown preview')));
       } else {
         this.renderMarkdown();
       }
@@ -162,10 +163,12 @@ export default {
         />
       </div>
     </div>
-    <div v-show="previewMarkdown" class="md md-preview-holder md-preview js-vue-md-preview">
-      <div ref="markdown-preview" v-html="markdownPreview"></div>
-      <span v-if="markdownPreviewLoading"> Loading... </span>
-    </div>
+    <div
+      v-show="previewMarkdown"
+      ref="markdown-preview"
+      class="md-preview js-vue-md-preview md md-preview-holder"
+      v-html="markdownPreview"
+    ></div>
     <template v-if="previewMarkdown && !markdownPreviewLoading">
       <div v-if="referencedCommands" class="referenced-commands" v-html="referencedCommands"></div>
       <div v-if="shouldShowReferencedUsers" class="referenced-users">
diff --git a/changelogs/unreleased/54160-use-reports-syntax-for-sast-in-auto-devops.yml b/changelogs/unreleased/54160-use-reports-syntax-for-sast-in-auto-devops.yml
new file mode 100644
index 00000000000..86c5a0c5a95
--- /dev/null
+++ b/changelogs/unreleased/54160-use-reports-syntax-for-sast-in-auto-devops.yml
@@ -0,0 +1,5 @@
+---
+title: Use reports syntax for SAST in Auto DevOps
+merge_request: 23163
+author:
+type: changed
diff --git a/changelogs/unreleased/winh-markdown-preview-lists.yml b/changelogs/unreleased/winh-markdown-preview-lists.yml
new file mode 100644
index 00000000000..6e47726283d
--- /dev/null
+++ b/changelogs/unreleased/winh-markdown-preview-lists.yml
@@ -0,0 +1,5 @@
+---
+title: Remove unnecessary div from MarkdownField to apply list styles correctly
+merge_request: 23733
+author:
+type: fixed
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
index 3b2cae07c12..d0613aa59e1 100644
--- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
@@ -164,7 +164,8 @@ sast:
     - setup_docker
     - sast
   artifacts:
-    paths: [gl-sast-report.json]
+    reports:
+      sast: gl-sast-report.json
   only:
     refs:
       - branches
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 2aeb015ed09..4f55eac44ab 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3913,6 +3913,9 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
+msgid "Loading…"
+msgstr ""
+
 msgid "Lock"
 msgstr ""
 
diff --git a/spec/features/merge_request/user_awards_emoji_spec.rb b/spec/features/merge_request/user_awards_emoji_spec.rb
index 859a4c65562..93376bc8ce0 100644
--- a/spec/features/merge_request/user_awards_emoji_spec.rb
+++ b/spec/features/merge_request/user_awards_emoji_spec.rb
@@ -4,11 +4,14 @@ describe 'Merge request > User awards emoji', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:merge_request) { create(:merge_request, source_project: project, author: create(:user)) }
+  let!(:note) { create(:note, noteable: merge_request, project: merge_request.project) }
 
   describe 'logged in' do
     before do
       sign_in(user)
       visit project_merge_request_path(project, merge_request)
+
+      wait_for_requests
     end
 
     it 'adds award to merge request' do
@@ -36,6 +39,15 @@ describe 'Merge request > User awards emoji', :js do
       expect(page).to have_selector('.emoji-menu', count: 1)
     end
 
+    it 'adds awards to note' do
+      first('.js-note-emoji').click
+      first('.emoji-menu .js-emoji-btn').click
+
+      wait_for_requests
+
+      expect(page).to have_selector('.js-awards-block')
+    end
+
     describe 'the project is archived' do
       let(:project) { create(:project, :public, :repository, :archived) }
 
diff --git a/spec/javascripts/notes/components/note_app_spec.js b/spec/javascripts/notes/components/note_app_spec.js
index 0081f42c330..22bee049f9c 100644
--- a/spec/javascripts/notes/components/note_app_spec.js
+++ b/spec/javascripts/notes/components/note_app_spec.js
@@ -30,6 +30,8 @@ describe('note_app', () => {
     jasmine.addMatchers(vueMatchers);
     $('body').attr('data-page', 'projects:merge_requests:show');
 
+    setFixtures('<div class="js-vue-notes-event"><div id="app"></div></div>');
+
     const IssueNotesApp = Vue.extend(notesApp);
 
     store = createStore();
@@ -43,6 +45,7 @@ describe('note_app', () => {
       return mountComponentWithStore(IssueNotesApp, {
         props,
         store,
+        el: document.getElementById('app'),
       });
     };
   });
@@ -283,4 +286,24 @@ describe('note_app', () => {
       }, 0);
     });
   });
+
+  describe('emoji awards', () => {
+    it('dispatches toggleAward after toggleAward event', () => {
+      const toggleAwardEvent = new CustomEvent('toggleAward', {
+        detail: {
+          awardName: 'test',
+          noteId: 1,
+        },
+      });
+
+      spyOn(vm.$store, 'dispatch');
+
+      vm.$el.parentElement.dispatchEvent(toggleAwardEvent);
+
+      expect(vm.$store.dispatch).toHaveBeenCalledWith('toggleAward', {
+        awardName: 'test',
+        noteId: 1,
+      });
+    });
+  });
 });
diff --git a/spec/javascripts/vue_shared/components/markdown/field_spec.js b/spec/javascripts/vue_shared/components/markdown/field_spec.js
index abb17440c0e..79e0e756a7a 100644
--- a/spec/javascripts/vue_shared/components/markdown/field_spec.js
+++ b/spec/javascripts/vue_shared/components/markdown/field_spec.js
@@ -80,7 +80,7 @@ describe('Markdown field component', () => {
         previewLink.click();
 
         Vue.nextTick(() => {
-          expect(vm.$el.querySelector('.md-preview').textContent.trim()).toContain('Loading...');
+          expect(vm.$el.querySelector('.md-preview').textContent.trim()).toContain('Loading…');
 
           done();
         });