From 94611567bd03083e0ecef7a582a174aa34844482 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 30 Sep 2019 09:06:31 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../fixtures/lib/gitlab/import_export/project.json | 35 +++++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

(limited to 'spec/fixtures')

diff --git a/spec/fixtures/lib/gitlab/import_export/project.json b/spec/fixtures/lib/gitlab/import_export/project.json
index 5f4bf18c743..4544c38f39a 100644
--- a/spec/fixtures/lib/gitlab/import_export/project.json
+++ b/spec/fixtures/lib/gitlab/import_export/project.json
@@ -6161,7 +6161,7 @@
     {
       "id": 36,
       "project_id": 5,
-      "ref": "master",
+      "ref": null,
       "sha": "sha-notes",
       "before_sha": null,
       "push_data": null,
@@ -6289,19 +6289,21 @@
     {
       "id": 37,
       "project_id": 5,
-      "ref": null,
+      "ref": "master",
       "sha": "048721d90c449b244b7b4c53a9186b04330174ec",
       "before_sha": null,
       "push_data": null,
       "created_at": "2016-03-22T15:20:35.757Z",
       "updated_at": "2016-03-22T15:20:35.757Z",
-      "tag": null,
+      "tag": false,
       "yaml_errors": null,
       "committed_at": null,
       "status": "failed",
       "started_at": null,
       "finished_at": null,
       "duration": null,
+      "source": "merge_request_event",
+      "merge_request_id": 27,
       "stages": [
         {
           "id": 21,
@@ -6372,7 +6374,32 @@
             }
           ]
         }
-      ]
+      ],
+      "merge_request": {
+        "id": 27,
+        "target_branch": "feature",
+        "source_branch": "feature_conflict",
+        "source_project_id": 999,
+        "author_id": 1,
+        "assignee_id": null,
+        "title": "MR1",
+        "created_at": "2016-06-14T15:02:36.568Z",
+        "updated_at": "2016-06-14T15:02:56.815Z",
+        "state": "opened",
+        "merge_status": "unchecked",
+        "target_project_id": 5,
+        "iid": 9,
+        "description": null,
+        "position": 0,
+        "updated_by_id": null,
+        "merge_error": null,
+        "diff_head_sha": "HEAD",
+        "source_branch_sha": "ABCD",
+        "target_branch_sha": "DCBA",
+        "merge_params": {
+          "force_remove_source_branch": null
+        }
+      }
     },
     {
       "id": 38,
-- 
cgit v1.2.1