Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 4 deletions

diff --git a/spec/frontend/boards/components/board_settings_sidebar_spec.js b/spec/frontend/boards/components/board_settings_sidebar_spec.js
index 60d4d1cb8e3..642ffecff2d 100644
--- a/spec/frontend/boards/components/board_settings_sidebar_spec.js
+++ b/spec/frontend/boards/components/board_settings_sidebar_spec.js
@@ -1,4 +1,3 @@
-import '~/boards/models/list';
 import { GlDrawer, GlLabel } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import { MountingPortal } from 'portal-vue';
@@ -44,6 +43,7 @@ describe('BoardSettingsSidebar', () => {
         store,
         provide: {
           canAdminList,
+          scopedLabelsAvailable: false,
         },
       }),
     );
diff --git a/spec/frontend/fixtures/api_markdown.yml b/spec/frontend/fixtures/api_markdown.yml
index 1a6eebc0d4f..feede5458c7 100644
--- a/spec/frontend/fixtures/api_markdown.yml
+++ b/spec/frontend/fixtures/api_markdown.yml
@@ -173,13 +173,16 @@
     Hi @gitlab - thank you for reporting this ~bug (#1) we hope to fix it in %1.1 as part of !1
 - name: audio
   markdown: '![Sample Audio](https://gitlab.com/gitlab.mp3)'
-- name: audio_in_lists
+- name: video
+  markdown: '![Sample Video](https://gitlab.com/gitlab.mp4)'
+- name: audio_and_video_in_lists
   markdown: |-
     * ![Sample Audio](https://gitlab.com/1.mp3)
-    * ![Sample Audio](https://gitlab.com/2.mp3)
+    * ![Sample Video](https://gitlab.com/2.mp4)
 
-    1. ![Sample Audio](https://gitlab.com/1.mp3)
+    1. ![Sample Video](https://gitlab.com/1.mp4)
     2. ![Sample Audio](https://gitlab.com/2.mp3)
 
     * [x] ![Sample Audio](https://gitlab.com/1.mp3)
     * [x] ![Sample Audio](https://gitlab.com/2.mp3)
+    * [x] ![Sample Video](https://gitlab.com/3.mp4)