Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 10 deletions

diff --git a/spec/frontend/releases/__snapshots__/util_spec.js.snap b/spec/frontend/releases/__snapshots__/util_spec.js.snap
index 0a796b0dbe6..2a12d945792 100644
--- a/spec/frontend/releases/__snapshots__/util_spec.js.snap
+++ b/spec/frontend/releases/__snapshots__/util_spec.js.snap
@@ -214,7 +214,6 @@ Object {
       "selfUrl": "http://localhost/releases-namespace/releases-project/-/releases/v1.1",
     },
     "assets": Object {
-      "count": undefined,
       "links": Array [
         Object {
           "directAssetPath": "/binaries/awesome-app-3",
@@ -247,29 +246,22 @@ Object {
       ],
       "sources": Array [],
     },
-    "author": undefined,
     "description": "Best. Release. **Ever.** :rocket:",
     "evidences": Array [],
     "milestones": Array [
       Object {
         "id": "gid://gitlab/Milestone/123",
         "issueStats": Object {},
-        "stats": undefined,
         "title": "12.3",
-        "webPath": undefined,
-        "webUrl": undefined,
       },
       Object {
         "id": "gid://gitlab/Milestone/124",
         "issueStats": Object {},
-        "stats": undefined,
         "title": "12.4",
-        "webPath": undefined,
-        "webUrl": undefined,
       },
     ],
     "name": "The first release",
-    "releasedAt": 2018-12-10T00:00:00.000Z,
+    "releasedAt": "2018-12-10T00:00:00.000Z",
     "tagName": "v1.1",
     "tagPath": "/releases-namespace/releases-project/-/tags/v1.1",
   },
diff --git a/spec/frontend/releases/util_spec.js b/spec/frontend/releases/util_spec.js
index 055c8e8b39f..dfea3fc0037 100644
--- a/spec/frontend/releases/util_spec.js
+++ b/spec/frontend/releases/util_spec.js
@@ -7,6 +7,7 @@ import {
   convertAllReleasesGraphQLResponse,
   convertOneReleaseGraphQLResponse,
 } from '~/releases/util';
+import { stripTypenames } from 'helpers/graphql_helpers';
 
 describe('releases/util.js', () => {
   describe('convertGraphQLRelease', () => {
@@ -136,7 +137,7 @@ describe('releases/util.js', () => {
   describe('convertOneReleaseForEditingGraphQLResponse', () => {
     it('matches snapshot', () => {
       expect(
-        convertOneReleaseGraphQLResponse(originalOneReleaseForEditingQueryResponse),
+        stripTypenames(convertOneReleaseGraphQLResponse(originalOneReleaseForEditingQueryResponse)),
       ).toMatchSnapshot();
     });
   });