Merge pull request #13561 from strapi/master

Update 4.2.0 with master
strapi · Jun 15, 2022 · 2cc62a0 · 2cc62a0
2 parents b21bfb0 + aeb21ff
commit 2cc62a0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/packages/core/upload/server/controllers/content-api.js b/packages/core/upload/server/controllers/content-api.js
@@ -37,10 +37,6 @@ module.exports = {
     ctx.body = await sanitizeOutput(file, ctx);
   },
 
-  async count(ctx) {
-    ctx.body = await getService('upload').count(ctx.query);
-  },
-
   async destroy(ctx) {
     const {
       params: { id },

diff --git a/packages/core/upload/server/routes/content-api.js b/packages/core/upload/server/routes/content-api.js
@@ -8,11 +8,6 @@ module.exports = {
       path: '/',
       handler: 'content-api.upload',
     },
-    {
-      method: 'GET',
-      path: '/files/count',
-      handler: 'content-api.count',
-    },
     {
       method: 'GET',
       path: '/files',

diff --git a/packages/plugins/i18n/server/constants/iso-locales.json b/packages/plugins/i18n/server/constants/iso-locales.json
@@ -1019,6 +1019,10 @@
     "code":"kn-IN",
     "name":"Kannada (India) (kn-IN)"
   },
+  {
+    "code":"kaa",
+    "name":"Kara-Kalpak (kaa)"
+  },
   {
     "code":"kk",
     "name":"Kazakh (kk)"

diff --git a/packages/plugins/i18n/server/services/__tests__/__snapshots__/iso-locales.test.js.snap b/packages/plugins/i18n/server/services/__tests__/__snapshots__/iso-locales.test.js.snap
@@ -1022,6 +1022,10 @@ Array [
     "code": "kn-IN",
     "name": "Kannada (India) (kn-IN)",
   },
+  Object {
+    "code": "kaa",
+    "name": "Kara-Kalpak (kaa)",
+  },
   Object {
     "code": "kk",
     "name": "Kazakh (kk)",