Add latest changes from gitlab-org/gitlab@master

2 files changed, 90 insertions, 13 deletions

diff --git a/spec/fixtures/api/schemas/error_tracking/error_detailed.json b/spec/fixtures/api/schemas/error_tracking/error_detailed.json
index 9a6797bf3c7..57cf5e677d6 100644
--- a/spec/fixtures/api/schemas/error_tracking/error_detailed.json
+++ b/spec/fixtures/api/schemas/error_tracking/error_detailed.json
@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "required" : [
+  "required": [
     "external_url",
     "external_base_url",
     "last_seen",
@@ -18,9 +18,10 @@
     "first_release_last_commit",
     "last_release_last_commit",
     "first_release_short_version",
-    "last_release_short_version"
+    "last_release_short_version",
+    "gitlab_commit"
   ],
-  "properties" : {
+  "properties": {
     "id": { "type": "string" },
     "first_seen": { "type": "string", "format": "date-time" },
     "last_seen": { "type": "string", "format": "date-time" },
@@ -30,13 +31,10 @@
     "count": { "type": "integer" },
     "external_url": { "type": "string" },
     "external_base_url": { "type": "string" },
-    "user_count": { "type": "integer"},
+    "user_count": { "type": "integer" },
     "tags": {
       "type": "object",
-      "required" : [
-        "level",
-        "logger"
-      ],
+      "required": ["level", "logger"],
       "properties": {
         "level": {
           "type": "string"
@@ -57,7 +55,8 @@
     "first_release_last_commit": { "type": ["string", "null"] },
     "last_release_last_commit": { "type": ["string", "null"] },
     "first_release_short_version": { "type": ["string", "null"] },
-    "last_release_short_version": { "type": ["string", "null"] }
+    "last_release_short_version": { "type": ["string", "null"] },
+    "gitlab_commit": { "type": ["string", "null"] }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/lib/gitlab/import_export/complex/project.json b/spec/fixtures/lib/gitlab/import_export/complex/project.json
index 583d6c7b78a..c33a88366d5 100644
--- a/spec/fixtures/lib/gitlab/import_export/complex/project.json
+++ b/spec/fixtures/lib/gitlab/import_export/complex/project.json
@@ -80,6 +80,17 @@
           "issue_id": 40
         }
       ],
+      "award_emoji": [
+        {
+          "id": 1,
+          "name": "musical_keyboard",
+          "user_id": 1,
+          "awardable_type": "Issue",
+          "awardable_id": 40,
+          "created_at": "2020-01-07T11:55:22.234Z",
+          "updated_at": "2020-01-07T11:55:22.234Z"
+        }
+      ],
       "zoom_meetings": [
         {
           "id": 1,
@@ -188,7 +199,18 @@
           "author": {
             "name": "User 4"
           },
-          "events": []
+          "events": [],
+          "award_emoji": [
+            {
+              "id": 1,
+              "name": "clapper",
+              "user_id": 1,
+              "awardable_type": "Note",
+              "awardable_id": 351,
+              "created_at": "2020-01-07T11:55:22.234Z",
+              "updated_at": "2020-01-07T11:55:22.234Z"
+            }
+          ]
         },
         {
           "id": 352,
@@ -2297,7 +2319,32 @@
           "updated_at": "2019-11-05T15:37:24.645Z"
         }
       ],
-      "notes": []
+      "notes": [
+        {
+          "id": 872,
+          "note": "This is a test note",
+          "noteable_type": "Snippet",
+          "author_id": 1,
+          "created_at": "2019-11-05T15:37:24.645Z",
+          "updated_at": "2019-11-05T15:37:24.645Z",
+          "noteable_id": 1,
+          "author": {
+            "name": "Random name"
+          },
+          "events": [],
+          "award_emoji": [
+            {
+              "id": 12,
+              "name": "thumbsup",
+              "user_id": 1,
+              "awardable_type": "Note",
+              "awardable_id": 872,
+              "created_at": "2019-11-05T15:37:21.287Z",
+              "updated_at": "2019-11-05T15:37:21.287Z"
+            }
+          ]
+        }
+      ]
     }
   ],
   "releases": [],
@@ -2434,7 +2481,18 @@
           "author": {
             "name": "User 4"
           },
-          "events": []
+          "events": [],
+          "award_emoji": [
+            {
+              "id": 1,
+              "name": "tada",
+              "user_id": 1,
+              "awardable_type": "Note",
+              "awardable_id": 1,
+              "created_at": "2019-11-05T15:37:21.287Z",
+              "updated_at": "2019-11-05T15:37:21.287Z"
+            }
+          ]
         },
         {
           "id": 672,
@@ -2840,7 +2898,27 @@
           "author_id": 1
         }
       ],
-      "approvals_before_merge": 1
+      "approvals_before_merge": 1,
+      "award_emoji": [
+        {
+          "id": 1,
+          "name": "thumbsup",
+          "user_id": 1,
+          "awardable_type": "MergeRequest",
+          "awardable_id": 27,
+          "created_at": "2020-01-07T11:21:21.235Z",
+          "updated_at": "2020-01-07T11:21:21.235Z"
+        },
+        {
+          "id": 2,
+          "name": "drum",
+          "user_id": 1,
+          "awardable_type": "MergeRequest",
+          "awardable_id": 27,
+          "created_at": "2020-01-07T11:21:21.235Z",
+          "updated_at": "2020-01-07T11:21:21.235Z"
+        }
+      ]
     },
     {
       "id": 26,