Revert "Merge branch 'split-events-into-push-events' into 'master'"

This reverts commit e80a893ff0ea8466099f6478183631af55933db2, reversing
changes made to 9c11894a656603c59c03d8f35fbe8cdf7a1ad0c4.

1 files changed, 33 insertions, 9 deletions

diff --git a/doc/api/events.md b/doc/api/events.md
index 129af0afa35..3d5170f3f1e 100644
--- a/doc/api/events.md
+++ b/doc/api/events.md
@@ -79,6 +79,7 @@ Example response:
     "target_id":160,
     "target_type":"Issue",
     "author_id":25,
+    "data":null,
     "target_title":"Qui natus eos odio tempore et quaerat consequuntur ducimus cupiditate quis.",
     "created_at":"2017-02-09T10:43:19.667Z",
     "author":{
@@ -98,6 +99,7 @@ Example response:
     "target_id":159,
     "target_type":"Issue",
     "author_id":21,
+    "data":null,
     "target_title":"Nostrum enim non et sed optio illo deleniti non.",
     "created_at":"2017-02-09T10:43:19.426Z",
     "author":{
@@ -149,6 +151,7 @@ Example response:
     "target_id": 830,
     "target_type": "Issue",
     "author_id": 1,
+    "data": null,
     "target_title": "Public project search field",
     "author": {
       "name": "Dmitriy Zaporozhets",
@@ -163,7 +166,7 @@ Example response:
   {
     "title": null,
     "project_id": 15,
-    "action_name": "pushed",
+    "action_name": "opened",
     "target_id": null,
     "target_type": null,
     "author_id": 1,
@@ -176,14 +179,31 @@ Example response:
       "web_url": "http://localhost:3000/root"
     },
     "author_username": "john",
-    "push_data": {
-      "commit_count": 1,
-      "action": "pushed",
-      "ref_type": "branch",
-      "commit_from": "50d4420237a9de7be1304607147aec22e4a14af7",
-      "commit_to": "c5feabde2d8cd023215af4d2ceeb7a64839fc428",
-      "ref": "master",
-      "commit_title": "Add simple search to projects in public area"
+    "data": {
+      "before": "50d4420237a9de7be1304607147aec22e4a14af7",
+      "after": "c5feabde2d8cd023215af4d2ceeb7a64839fc428",
+      "ref": "refs/heads/master",
+      "user_id": 1,
+      "user_name": "Dmitriy Zaporozhets",
+      "repository": {
+        "name": "gitlabhq",
+        "url": "git@dev.gitlab.org:gitlab/gitlabhq.git",
+        "description": "GitLab: self hosted Git management software. \r\nDistributed under the MIT License.",
+        "homepage": "https://dev.gitlab.org/gitlab/gitlabhq"
+      },
+      "commits": [
+        {
+          "id": "c5feabde2d8cd023215af4d2ceeb7a64839fc428",
+          "message": "Add simple search to projects in public area",
+          "timestamp": "2013-05-13T18:18:08+00:00",
+          "url": "https://dev.gitlab.org/gitlab/gitlabhq/commit/c5feabde2d8cd023215af4d2ceeb7a64839fc428",
+          "author": {
+            "name": "Dmitriy Zaporozhets",
+            "email": "dmitriy.zaporozhets@gmail.com"
+          }
+        }
+      ],
+      "total_commits_count": 1
     },
     "target_title": null
   },
@@ -194,6 +214,7 @@ Example response:
     "target_id": 840,
     "target_type": "Issue",
     "author_id": 1,
+    "data": null,
     "target_title": "Finish & merge Code search PR",
     "author": {
       "name": "Dmitriy Zaporozhets",
@@ -212,6 +233,7 @@ Example response:
     "target_id": 1312,
     "target_type": "Note",
     "author_id": 1,
+    "data": null,
     "target_title": null,
     "created_at": "2015-12-04T10:33:58.089Z",
     "note": {
@@ -283,6 +305,7 @@ Example response:
     "target_iid":160,
     "target_type":"Issue",
     "author_id":25,
+    "data":null,
     "target_title":"Qui natus eos odio tempore et quaerat consequuntur ducimus cupiditate quis.",
     "created_at":"2017-02-09T10:43:19.667Z",
     "author":{
@@ -303,6 +326,7 @@ Example response:
     "target_iid":159,
     "target_type":"Issue",
     "author_id":21,
+    "data":null,
     "target_title":"Nostrum enim non et sed optio illo deleniti non.",
     "created_at":"2017-02-09T10:43:19.426Z",
     "author":{