Merge branch 'master' into master

src/test/resources/org/gitlab4j/api/note-merge-request-event.json

@@ -30,6 +30,8 @@
   "object_attributes": {
     "id": 1244,
     "note": "This MR needs work.",
+    "discussion_id": "56e2b4210419aed077d47ca2dc00551c7c4ac882",
+    "type": "DiscussionNote",
     "noteable_type": "MergeRequest",
     "author_id": 1,
     "created_at": "2015-05-17T18:21:36Z",

src/test/resources/org/gitlab4j/api/note-snippet-event.json

@@ -30,6 +30,8 @@
   "object_attributes": {
     "id": 1245,
     "note": "Is this snippet doing what it's supposed to be doing?",
+    "discussion_id": "56e2b4210419aed077d47ca2dc00551c7c4ac882",
+    "type": "DiscussionNote",
     "noteable_type": "Snippet",
     "author_id": 1,
     "created_at": "2015-05-17T18:35:50Z",

src/test/resources/org/gitlab4j/api/project.json

@@ -2,10 +2,11 @@
   "id": 3,
   "default_branch": "master",
   "public": false,
-  "visibility_level": 0,
+  "visibility": "private",
   "ssh_url_to_repo": "git@example.com:diaspora/diaspora-project-site.git",
   "http_url_to_repo": "http://example.com/diaspora/diaspora-project-site.git",
   "web_url": "http://example.com/diaspora/diaspora-project-site",
+  "readme_url": "http://example.com/diaspora/diaspora-project-site/blob/master/README.md",
   "tag_list": [
     "example",
     "disapora project"
@@ -25,6 +26,8 @@
   "jobs_enabled": true,
   "wiki_enabled": true,
   "snippets_enabled": false,
+  "can_create_merge_request_in": true,
+  "resolve_outdated_diff_discussions": false,
   "container_registry_enabled": false,
   "created_at": "2013-09-30T13:46:02Z",
   "last_activity_at": "2013-09-30T13:46:02Z",
@@ -32,8 +35,13 @@
   "namespace": {
     "id": 3,
     "name": "Diaspora",
-    "path": "diaspora"
+    "path": "diaspora",
+    "kind": "group",
+    "full_path": "diaspora",
+    "avatar_url": "http://localhost:3000/uploads/group/avatar/3/foo.jpg",
+    "web_url": "http://localhost:3000/groups/diaspora"
   },
+  "import_status": "none",
   "permissions": {
     "project_access": {
       "access_level": 10,
@@ -44,47 +52,56 @@
       "notification_level": 3
     }
   },
-  "empty_repo": true,
   "archived": false,
   "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
+  "license_url": "http://example.com/diaspora/diaspora-client/blob/master/LICENSE",
+  "license": {
+    "key": "lgpl-3.0",
+    "name": "GNU Lesser General Public License v3.0",
+    "nickname": "GNU LGPLv3",
+    "html_url": "http://choosealicense.com/licenses/lgpl-3.0/",
+    "source_url": "http://www.gnu.org/licenses/lgpl-3.0.txt"
+  },
   "shared_runners_enabled": true,
   "forks_count": 0,
   "star_count": 0,
   "runners_token": "b8bc4a7a29eb76ea83cf79e4908c2b",
+  "ci_default_git_depth": 50,
   "public_jobs": true,
   "shared_with_groups": [
     {
       "group_id": 4,
       "group_name": "Twitter",
+      "group_full_path": "twitter",
       "group_access_level": 30
     },
     {
       "group_id": 3,
       "group_name": "Gitlab Org",
+      "group_full_path": "gitlab-org",
       "group_access_level": 10
     }
   ],
   "repository_storage": "default",
   "only_allow_merge_if_pipeline_succeeds": false,
   "only_allow_merge_if_all_discussions_are_resolved": false,
+  "remove_source_branch_after_merge": false,
   "request_access_enabled": false,
   "merge_method": "merge",
+  "auto_devops_enabled": true,
+  "auto_devops_deploy_strategy": "continuous",
+  "approvals_before_merge": 0,
+  "packages_enabled": true,
+  "autoclose_referenced_issues": true,
+  "marked_for_deletion_on": "2020-04-03",
   "statistics": {
-    "commit_count": 9827,
-    "storage_size": 169043997645,
-    "repository_size": 388717608,
-    "wiki_size": 52428,
-    "lfs_objects_size": 2118052893,
-    "job_artifacts_size": 166537174716
-  },
-  "marked_for_deletion_on": "2016-06-17",
-  "license_url": "http://example.com/diaspora/diaspora-client/blob/master/LICENSE",
-  "license": {
-    "key": "lgpl-3.0",
-    "name": "GNU Lesser General Public License v3.0",
-    "nickname": "GNU LGPLv3",
-    "html_url": "http://choosealicense.com/licenses/lgpl-3.0/",
-    "source_url": "http://www.gnu.org/licenses/lgpl-3.0.txt"
+    "commit_count": 37,
+    "storage_size": 1038090,
+    "repository_size": 1038090,
+    "wiki_size": 0,
+    "lfs_objects_size": 0,
+    "job_artifacts_size": 0,
+    "packages_size": 0
   },
   "custom_attributes": []
 }
\ No newline at end of file