Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

2 files changed, 83 insertions, 3 deletions

diff --git a/spec/fixtures/lib/gitlab/import_export/complex/project.json b/spec/fixtures/lib/gitlab/import_export/complex/project.json
index e721525f00c..12dbabf833b 100644
--- a/spec/fixtures/lib/gitlab/import_export/complex/project.json
+++ b/spec/fixtures/lib/gitlab/import_export/complex/project.json
@@ -2361,14 +2361,53 @@
   "releases": [
     {
       "id": 1,
+      "tag": "release-1.0",
+      "description": "Some release notes",
+      "project_id": 5,
+      "created_at": "2019-12-25T10:17:14.621Z",
+      "updated_at": "2019-12-25T10:17:14.621Z",
+      "author_id": null,
+      "name": "release-1.0",
+      "sha": "902de3a8bd5573f4a049b1457d28bc1592baaa2e",
+      "released_at": "2019-12-25T10:17:14.615Z",
+      "links": [
+        {
+          "id": 1,
+          "release_id": 1,
+          "url": "http://localhost/namespace6/project6/-/jobs/140463678/artifacts/download",
+          "name": "release-1.0.dmg",
+          "created_at": "2019-12-25T10:17:14.621Z",
+          "updated_at": "2019-12-25T10:17:14.621Z"
+        }
+      ],
+      "milestone_releases": [
+        {
+          "milestone_id": 1349,
+          "release_id": 9172,
+          "milestone": {
+            "id": 1,
+            "title": "test milestone",
+            "project_id": 8,
+            "description": "test milestone",
+            "due_date": null,
+            "created_at": "2016-06-14T15:02:04.415Z",
+            "updated_at": "2016-06-14T15:02:04.415Z",
+            "state": "active",
+            "iid": 1
+          }
+        }
+      ]
+    },
+    {
+      "id": 2,
       "tag": "release-1.1",
       "description": "Some release notes",
       "project_id": 5,
       "created_at": "2019-12-26T10:17:14.621Z",
       "updated_at": "2019-12-26T10:17:14.621Z",
-      "author_id": 1,
+      "author_id": 16,
       "name": "release-1.1",
-      "sha": "901de3a8bd5573f4a049b1457d28bc1592ba6bf9",
+      "sha": "902de3a8bd5573f4a049b1457d28bc1592ba6bg9",
       "released_at": "2019-12-26T10:17:14.615Z",
       "links": [
         {
@@ -2397,6 +2436,45 @@
           }
         }
       ]
+    },
+    {
+      "id": 3,
+      "tag": "release-1.2",
+      "description": "Some release notes",
+      "project_id": 5,
+      "created_at": "2019-12-27T10:17:14.621Z",
+      "updated_at": "2019-12-27T10:17:14.621Z",
+      "author_id": 1,
+      "name": "release-1.2",
+      "sha": "903de3a8bd5573f4a049b1457d28bc1592ba6bf9",
+      "released_at": "2019-12-27T10:17:14.615Z",
+      "links": [
+        {
+          "id": 1,
+          "release_id": 1,
+          "url": "http://localhost/namespace6/project6/-/jobs/140463678/artifacts/download",
+          "name": "release-1.2.dmg",
+          "created_at": "2019-12-27T10:17:14.621Z",
+          "updated_at": "2019-12-27T10:17:14.621Z"
+        }
+      ],
+      "milestone_releases": [
+        {
+          "milestone_id": 1349,
+          "release_id": 9172,
+          "milestone": {
+            "id": 1,
+            "title": "test milestone",
+            "project_id": 8,
+            "description": "test milestone",
+            "due_date": null,
+            "created_at": "2016-06-14T15:02:04.415Z",
+            "updated_at": "2016-06-14T15:02:04.415Z",
+            "state": "active",
+            "iid": 1
+          }
+        }
+      ]
     }
   ],
   "project_members": [
diff --git a/spec/fixtures/lib/gitlab/import_export/complex/tree/project/releases.ndjson b/spec/fixtures/lib/gitlab/import_export/complex/tree/project/releases.ndjson
index a194898cb5a..dfbde1f2598 100644
--- a/spec/fixtures/lib/gitlab/import_export/complex/tree/project/releases.ndjson
+++ b/spec/fixtures/lib/gitlab/import_export/complex/tree/project/releases.ndjson
@@ -1 +1,3 @@
-{"id":1,"tag":"release-1.1","description":"Some release notes","project_id":5,"created_at":"2019-12-26T10:17:14.621Z","updated_at":"2019-12-26T10:17:14.621Z","author_id":1,"name":"release-1.1","sha":"901de3a8bd5573f4a049b1457d28bc1592ba6bf9","released_at":"2019-12-26T10:17:14.615Z","links":[{"id":1,"release_id":1,"url":"http://localhost/namespace6/project6/-/jobs/140463678/artifacts/download","name":"release-1.1.dmg","created_at":"2019-12-26T10:17:14.621Z","updated_at":"2019-12-26T10:17:14.621Z"}],"milestone_releases":[{"milestone_id":1349,"release_id":9172,"milestone":{"id":1,"title":"test milestone","project_id":8,"description":"test milestone","due_date":null,"created_at":"2016-06-14T15:02:04.415Z","updated_at":"2016-06-14T15:02:04.415Z","state":"active","iid":1}}]}
+{"id":1,"tag":"release-1.0","description":"Some release notes","project_id":5,"created_at":"2019-12-25T10:17:14.621Z","updated_at":"2019-12-25T10:17:14.621Z","author_id":null,"name":"release-1.0","sha":"901de3a8bd5573f4a049b1457d28bc1592baaa2e","released_at":"2019-12-25T10:17:14.615Z","links":[{"id":1,"release_id":1,"url":"http://localhost/namespace6/project6/-/jobs/140463678/artifacts/download","name":"release-1.0.dmg","created_at":"2019-12-25T10:17:14.621Z","updated_at":"2019-12-25T10:17:14.621Z"}],"milestone_releases":[{"milestone_id":1349,"release_id":9172,"milestone":{"id":1,"title":"test milestone","project_id":8,"description":"test milestone","due_date":null,"created_at":"2016-06-14T15:02:04.415Z","updated_at":"2016-06-14T15:02:04.415Z","state":"active","iid":1}}]}
+{"id":2,"tag":"release-1.1","description":"Some release notes","project_id":5,"created_at":"2019-12-26T10:17:14.621Z","updated_at":"2019-12-26T10:17:14.621Z","author_id":16,"name":"release-1.1","sha":"902de3a8bd5573f4a049b1457d28bc1592ba6bg9","released_at":"2019-12-26T10:17:14.615Z","links":[{"id":1,"release_id":1,"url":"http://localhost/namespace6/project6/-/jobs/140463678/artifacts/download","name":"release-1.1.dmg","created_at":"2019-12-26T10:17:14.621Z","updated_at":"2019-12-26T10:17:14.621Z"}],"milestone_releases":[{"milestone_id":1349,"release_id":9172,"milestone":{"id":1,"title":"test milestone","project_id":8,"description":"test milestone","due_date":null,"created_at":"2016-06-14T15:02:04.415Z","updated_at":"2016-06-14T15:02:04.415Z","state":"active","iid":1}}]}
+{"id":3,"tag":"release-1.2","description":"Some release notes","project_id":5,"created_at":"2019-12-27T10:17:14.621Z","updated_at":"2019-12-27T10:17:14.621Z","author_id":1,"name":"release-1.2","sha":"903de3a8bd5573f4a049b1457d28bc1592ba6bf9","released_at":"2019-12-27T10:17:14.615Z","links":[{"id":1,"release_id":1,"url":"http://localhost/namespace6/project6/-/jobs/140463678/artifacts/download","name":"release-1.2.dmg","created_at":"2019-12-27T10:17:14.621Z","updated_at":"2019-12-27T10:17:14.621Z"}],"milestone_releases":[{"milestone_id":1349,"release_id":9172,"milestone":{"id":1,"title":"test milestone","project_id":8,"description":"test milestone","due_date":null,"created_at":"2016-06-14T15:02:04.415Z","updated_at":"2016-06-14T15:02:04.415Z","state":"active","iid":1}}]}