Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/spec/frontend_integration/snippets/snippets_notes_spec.js b/spec/frontend_integration/snippets/snippets_notes_spec.js
index 27be7793ce6..b7d2c8924f6 100644
--- a/spec/frontend_integration/snippets/snippets_notes_spec.js
+++ b/spec/frontend_integration/snippets/snippets_notes_spec.js
@@ -51,7 +51,7 @@ describe('Integration Snippets notes', () => {
           'circled latin capital letter m',
         ],
       ],
-      [':', ['100', '1234', '8ball', 'a', 'ab']],
+      [':', ['grinning', 'smiley', 'smile', 'grin', 'laughing']],
       // We do not want the search to start with space https://gitlab.com/gitlab-org/gitlab/-/issues/322548
       [': ', []],
       // We want to preserve that we can have space INSIDE the search
diff --git a/spec/frontend_integration/test_helpers/mock_server/routes/emojis.js b/spec/frontend_integration/test_helpers/mock_server/routes/emojis.js
index 83991ad5af9..72953b94552 100644
--- a/spec/frontend_integration/test_helpers/mock_server/routes/emojis.js
+++ b/spec/frontend_integration/test_helpers/mock_server/routes/emojis.js
@@ -1,5 +1,5 @@
 import { Response } from 'miragejs';
-import emojis from 'public/-/emojis/2/emojis.json';
+import emojis from 'public/-/emojis/3/emojis.json';
 import { EMOJI_VERSION } from '~/emoji';
 import { HTTP_STATUS_OK } from '~/lib/utils/http_status';