summaryrefslogtreecommitdiff
path: root/doc/api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-04 03:08:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-04 03:08:50 +0000
commitbb19d18713d1b3da7d564826f5e21e8d9f9f36cd (patch)
tree253b299d67af8b585e1db009244ae308d64ad9b3 /doc/api
parent4fe93274dec62ff7361a67be88e320131d66b788 (diff)
downloadgitlab-ce-bb19d18713d1b3da7d564826f5e21e8d9f9f36cd.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/commits.md28
-rw-r--r--doc/api/merge_request_context_commits.md18
-rw-r--r--doc/api/merge_requests.md8
-rw-r--r--doc/api/repositories.md16
4 files changed, 35 insertions, 35 deletions
diff --git a/doc/api/commits.md b/doc/api/commits.md
index 90632a2faa0..02fb260d010 100644
--- a/doc/api/commits.md
+++ b/doc/api/commits.md
@@ -32,8 +32,8 @@ Example response:
"id": "ed899a2f4b50b4370feeea94676502b42383c746",
"short_id": "ed899a2f4b5",
"title": "Replace sanitize with escape once",
- "author_name": "Dmitriy Zaporozhets",
- "author_email": "dzaporozhets@sphereconsultinginc.com",
+ "author_name": "Example User",
+ "author_email": "user@example.com",
"authored_date": "2012-09-20T11:50:22+03:00",
"committer_name": "Administrator",
"committer_email": "admin@example.com",
@@ -50,9 +50,9 @@ Example response:
"short_id": "6104942438c",
"title": "Sanitize for network graph",
"author_name": "randx",
- "author_email": "dmitriy.zaporozhets@gmail.com",
- "committer_name": "Dmitriy",
- "committer_email": "dmitriy.zaporozhets@gmail.com",
+ "author_email": "user@example.com",
+ "committer_name": "ExampleName",
+ "committer_email": "user@example.com",
"created_at": "2012-09-20T09:06:12+03:00",
"message": "Sanitize for network graph",
"parent_ids": [
@@ -142,10 +142,10 @@ Example response:
"id": "ed899a2f4b50b4370feeea94676502b42383c746",
"short_id": "ed899a2f4b5",
"title": "some commit message",
- "author_name": "Dmitriy Zaporozhets",
- "author_email": "dzaporozhets@sphereconsultinginc.com",
- "committer_name": "Dmitriy Zaporozhets",
- "committer_email": "dzaporozhets@sphereconsultinginc.com",
+ "author_name": "Example User",
+ "author_email": "user@example.com",
+ "committer_name": "Example User",
+ "committer_email": "user@example.com",
"created_at": "2016-09-20T09:26:24.000-07:00",
"message": "some commit message",
"parent_ids": [
@@ -217,9 +217,9 @@ Example response:
"short_id": "6104942438c",
"title": "Sanitize for network graph",
"author_name": "randx",
- "author_email": "dmitriy.zaporozhets@gmail.com",
+ "author_email": "user@example.com",
"committer_name": "Dmitriy",
- "committer_email": "dmitriy.zaporozhets@gmail.com",
+ "committer_email": "user@example.com",
"created_at": "2012-09-20T09:06:12+03:00",
"message": "Sanitize for network graph",
"committed_date": "2012-09-20T09:06:12+03:00",
@@ -307,15 +307,15 @@ Example response:
"id": "8b090c1b79a14f2bd9e8a738f717824ff53aebad",
"short_id": "8b090c1b",
"title": "Feature added",
- "author_name": "Dmitriy Zaporozhets",
- "author_email": "dmitriy.zaporozhets@gmail.com",
+ "author_name": "Example User",
+ "author_email": "user@example.com",
"authored_date": "2016-12-12T20:10:39.000+01:00",
"created_at": "2016-12-12T20:10:39.000+01:00",
"committer_name": "Administrator",
"committer_email": "admin@example.com",
"committed_date": "2016-12-12T20:10:39.000+01:00",
"title": "Feature added",
- "message": "Feature added\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n",
+ "message": "Feature added\n\nSigned-off-by: Example User <user@example.com>\n",
"parent_ids": [
"a738f717824ff53aebad8b090c1b79a14f2bd9e8"
],
diff --git a/doc/api/merge_request_context_commits.md b/doc/api/merge_request_context_commits.md
index 58847dc20ae..260be467a06 100644
--- a/doc/api/merge_request_context_commits.md
+++ b/doc/api/merge_request_context_commits.md
@@ -22,11 +22,11 @@ Parameters:
"parent_ids": null,
"title": "Update README.md to include `Usage in testing and development`",
"message": "Update README.md to include `Usage in testing and development`",
- "author_name": "Luke \"Jared\" Bennett",
- "author_email": "lbennett@gitlab.com",
+ "author_name": "Example \"Sample\" User",
+ "author_email": "user@example.com",
"authored_date": "2017-04-11T10:08:59.000Z",
- "committer_name": "Luke \"Jared\" Bennett",
- "committer_email": "lbennett@gitlab.com",
+ "committer_name": "Example \"Sample\" User",
+ "committer_email": "user@example.com",
"committed_date": "2017-04-11T10:08:59.000Z"
}
]
@@ -57,16 +57,16 @@ POST /projects/:id/merge_requests/
[
{
"id": "6d394385cf567f80a8fd85055db1ab4c5295806f",
- "message": "Added contributing guide\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n",
+ "message": "Added contributing guide\n\nSigned-off-by: Example User <user@example.com>\n",
"parent_ids": [
"1a0b36b3cdad1d2ee32457c102a8c0b7056fa863"
],
"authored_date": "2014-02-27T10:05:10.000+02:00",
- "author_name": "Dmitriy Zaporozhets",
- "author_email": "dmitriy.zaporozhets@gmail.com",
+ "author_name": "Example User",
+ "author_email": "user@example.com",
"committed_date": "2014-02-27T10:05:10.000+02:00",
- "committer_name": "Dmitriy Zaporozhets",
- "committer_email": "dmitriy.zaporozhets@gmail.com"
+ "committer_name": "Example User",
+ "committer_email": "user@example.com"
}
]
```
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 75cb0e7f49b..bda4f05d23d 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -732,8 +732,8 @@ Parameters:
"id": "ed899a2f4b50b4370feeea94676502b42383c746",
"short_id": "ed899a2f4b5",
"title": "Replace sanitize with escape once",
- "author_name": "Dmitriy Zaporozhets",
- "author_email": "dzaporozhets@sphereconsultinginc.com",
+ "author_name": "Example User",
+ "author_email": "user@example.com",
"created_at": "2012-09-20T11:50:22+03:00",
"message": "Replace sanitize with escape once"
},
@@ -741,8 +741,8 @@ Parameters:
"id": "6104942438c14ec7bd21c6cd5bd995272b3faff6",
"short_id": "6104942438c",
"title": "Sanitize for network graph",
- "author_name": "randx",
- "author_email": "dmitriy.zaporozhets@gmail.com",
+ "author_name": "Example User",
+ "author_email": "user@example.com",
"created_at": "2012-09-20T09:06:12+03:00",
"message": "Sanitize for network graph"
}
diff --git a/doc/api/repositories.md b/doc/api/repositories.md
index 35762e3150f..f261c9ab9f7 100644
--- a/doc/api/repositories.md
+++ b/doc/api/repositories.md
@@ -154,16 +154,16 @@ Response:
"id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1",
"short_id": "12d65c8dd2b",
"title": "JS fix",
- "author_name": "Dmitriy Zaporozhets",
- "author_email": "dmitriy.zaporozhets@gmail.com",
+ "author_name": "Example User",
+ "author_email": "user@example.com",
"created_at": "2014-02-27T10:27:00+02:00"
},
"commits": [{
"id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1",
"short_id": "12d65c8dd2b",
"title": "JS fix",
- "author_name": "Dmitriy Zaporozhets",
- "author_email": "dmitriy.zaporozhets@gmail.com",
+ "author_name": "Example User",
+ "author_email": "user@example.com",
"created_at": "2014-02-27T10:27:00+02:00"
}],
"diffs": [{
@@ -241,11 +241,11 @@ Example response:
"created_at": "2014-02-27T08:03:18.000Z",
"parent_ids": [],
"message": "Initial commit\n",
- "author_name": "Dmitriy Zaporozhets",
- "author_email": "dmitriy.zaporozhets@gmail.com",
+ "author_name": "Example User",
+ "author_email": "user@example.com",
"authored_date": "2014-02-27T08:03:18.000Z",
- "committer_name": "Dmitriy Zaporozhets",
- "committer_email": "dmitriy.zaporozhets@gmail.com",
+ "committer_name": "Example User",
+ "committer_email": "user@example.com",
"committed_date": "2014-02-27T08:03:18.000Z"
}
```