Commit 7a0cfc82 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'docs-aqualls-remove-pii' into 'master'

Docs: redact personally identifying info from pages

See merge request gitlab-org/gitlab!26424
parents 889a7479 d05a8106
...@@ -32,8 +32,8 @@ Example response: ...@@ -32,8 +32,8 @@ Example response:
"id": "ed899a2f4b50b4370feeea94676502b42383c746", "id": "ed899a2f4b50b4370feeea94676502b42383c746",
"short_id": "ed899a2f4b5", "short_id": "ed899a2f4b5",
"title": "Replace sanitize with escape once", "title": "Replace sanitize with escape once",
"author_name": "Dmitriy Zaporozhets", "author_name": "Example User",
"author_email": "dzaporozhets@sphereconsultinginc.com", "author_email": "user@example.com",
"authored_date": "2012-09-20T11:50:22+03:00", "authored_date": "2012-09-20T11:50:22+03:00",
"committer_name": "Administrator", "committer_name": "Administrator",
"committer_email": "admin@example.com", "committer_email": "admin@example.com",
...@@ -50,9 +50,9 @@ Example response: ...@@ -50,9 +50,9 @@ Example response:
"short_id": "6104942438c", "short_id": "6104942438c",
"title": "Sanitize for network graph", "title": "Sanitize for network graph",
"author_name": "randx", "author_name": "randx",
"author_email": "dmitriy.zaporozhets@gmail.com", "author_email": "user@example.com",
"committer_name": "Dmitriy", "committer_name": "ExampleName",
"committer_email": "dmitriy.zaporozhets@gmail.com", "committer_email": "user@example.com",
"created_at": "2012-09-20T09:06:12+03:00", "created_at": "2012-09-20T09:06:12+03:00",
"message": "Sanitize for network graph", "message": "Sanitize for network graph",
"parent_ids": [ "parent_ids": [
...@@ -142,10 +142,10 @@ Example response: ...@@ -142,10 +142,10 @@ Example response:
"id": "ed899a2f4b50b4370feeea94676502b42383c746", "id": "ed899a2f4b50b4370feeea94676502b42383c746",
"short_id": "ed899a2f4b5", "short_id": "ed899a2f4b5",
"title": "some commit message", "title": "some commit message",
"author_name": "Dmitriy Zaporozhets", "author_name": "Example User",
"author_email": "dzaporozhets@sphereconsultinginc.com", "author_email": "user@example.com",
"committer_name": "Dmitriy Zaporozhets", "committer_name": "Example User",
"committer_email": "dzaporozhets@sphereconsultinginc.com", "committer_email": "user@example.com",
"created_at": "2016-09-20T09:26:24.000-07:00", "created_at": "2016-09-20T09:26:24.000-07:00",
"message": "some commit message", "message": "some commit message",
"parent_ids": [ "parent_ids": [
...@@ -217,9 +217,9 @@ Example response: ...@@ -217,9 +217,9 @@ Example response:
"short_id": "6104942438c", "short_id": "6104942438c",
"title": "Sanitize for network graph", "title": "Sanitize for network graph",
"author_name": "randx", "author_name": "randx",
"author_email": "dmitriy.zaporozhets@gmail.com", "author_email": "user@example.com",
"committer_name": "Dmitriy", "committer_name": "Dmitriy",
"committer_email": "dmitriy.zaporozhets@gmail.com", "committer_email": "user@example.com",
"created_at": "2012-09-20T09:06:12+03:00", "created_at": "2012-09-20T09:06:12+03:00",
"message": "Sanitize for network graph", "message": "Sanitize for network graph",
"committed_date": "2012-09-20T09:06:12+03:00", "committed_date": "2012-09-20T09:06:12+03:00",
...@@ -307,15 +307,15 @@ Example response: ...@@ -307,15 +307,15 @@ Example response:
"id": "8b090c1b79a14f2bd9e8a738f717824ff53aebad", "id": "8b090c1b79a14f2bd9e8a738f717824ff53aebad",
"short_id": "8b090c1b", "short_id": "8b090c1b",
"title": "Feature added", "title": "Feature added",
"author_name": "Dmitriy Zaporozhets", "author_name": "Example User",
"author_email": "dmitriy.zaporozhets@gmail.com", "author_email": "user@example.com",
"authored_date": "2016-12-12T20:10:39.000+01:00", "authored_date": "2016-12-12T20:10:39.000+01:00",
"created_at": "2016-12-12T20:10:39.000+01:00", "created_at": "2016-12-12T20:10:39.000+01:00",
"committer_name": "Administrator", "committer_name": "Administrator",
"committer_email": "admin@example.com", "committer_email": "admin@example.com",
"committed_date": "2016-12-12T20:10:39.000+01:00", "committed_date": "2016-12-12T20:10:39.000+01:00",
"title": "Feature added", "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": [ "parent_ids": [
"a738f717824ff53aebad8b090c1b79a14f2bd9e8" "a738f717824ff53aebad8b090c1b79a14f2bd9e8"
], ],
......
...@@ -22,11 +22,11 @@ Parameters: ...@@ -22,11 +22,11 @@ Parameters:
"parent_ids": null, "parent_ids": null,
"title": "Update README.md to include `Usage in testing and development`", "title": "Update README.md to include `Usage in testing and development`",
"message": "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_name": "Example \"Sample\" User",
"author_email": "lbennett@gitlab.com", "author_email": "user@example.com",
"authored_date": "2017-04-11T10:08:59.000Z", "authored_date": "2017-04-11T10:08:59.000Z",
"committer_name": "Luke \"Jared\" Bennett", "committer_name": "Example \"Sample\" User",
"committer_email": "lbennett@gitlab.com", "committer_email": "user@example.com",
"committed_date": "2017-04-11T10:08:59.000Z" "committed_date": "2017-04-11T10:08:59.000Z"
} }
] ]
...@@ -57,16 +57,16 @@ POST /projects/:id/merge_requests/ ...@@ -57,16 +57,16 @@ POST /projects/:id/merge_requests/
[ [
{ {
"id": "6d394385cf567f80a8fd85055db1ab4c5295806f", "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": [ "parent_ids": [
"1a0b36b3cdad1d2ee32457c102a8c0b7056fa863" "1a0b36b3cdad1d2ee32457c102a8c0b7056fa863"
], ],
"authored_date": "2014-02-27T10:05:10.000+02:00", "authored_date": "2014-02-27T10:05:10.000+02:00",
"author_name": "Dmitriy Zaporozhets", "author_name": "Example User",
"author_email": "dmitriy.zaporozhets@gmail.com", "author_email": "user@example.com",
"committed_date": "2014-02-27T10:05:10.000+02:00", "committed_date": "2014-02-27T10:05:10.000+02:00",
"committer_name": "Dmitriy Zaporozhets", "committer_name": "Example User",
"committer_email": "dmitriy.zaporozhets@gmail.com" "committer_email": "user@example.com"
} }
] ]
``` ```
......
...@@ -732,8 +732,8 @@ Parameters: ...@@ -732,8 +732,8 @@ Parameters:
"id": "ed899a2f4b50b4370feeea94676502b42383c746", "id": "ed899a2f4b50b4370feeea94676502b42383c746",
"short_id": "ed899a2f4b5", "short_id": "ed899a2f4b5",
"title": "Replace sanitize with escape once", "title": "Replace sanitize with escape once",
"author_name": "Dmitriy Zaporozhets", "author_name": "Example User",
"author_email": "dzaporozhets@sphereconsultinginc.com", "author_email": "user@example.com",
"created_at": "2012-09-20T11:50:22+03:00", "created_at": "2012-09-20T11:50:22+03:00",
"message": "Replace sanitize with escape once" "message": "Replace sanitize with escape once"
}, },
...@@ -741,8 +741,8 @@ Parameters: ...@@ -741,8 +741,8 @@ Parameters:
"id": "6104942438c14ec7bd21c6cd5bd995272b3faff6", "id": "6104942438c14ec7bd21c6cd5bd995272b3faff6",
"short_id": "6104942438c", "short_id": "6104942438c",
"title": "Sanitize for network graph", "title": "Sanitize for network graph",
"author_name": "randx", "author_name": "Example User",
"author_email": "dmitriy.zaporozhets@gmail.com", "author_email": "user@example.com",
"created_at": "2012-09-20T09:06:12+03:00", "created_at": "2012-09-20T09:06:12+03:00",
"message": "Sanitize for network graph" "message": "Sanitize for network graph"
} }
......
...@@ -154,16 +154,16 @@ Response: ...@@ -154,16 +154,16 @@ Response:
"id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1", "id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1",
"short_id": "12d65c8dd2b", "short_id": "12d65c8dd2b",
"title": "JS fix", "title": "JS fix",
"author_name": "Dmitriy Zaporozhets", "author_name": "Example User",
"author_email": "dmitriy.zaporozhets@gmail.com", "author_email": "user@example.com",
"created_at": "2014-02-27T10:27:00+02:00" "created_at": "2014-02-27T10:27:00+02:00"
}, },
"commits": [{ "commits": [{
"id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1", "id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1",
"short_id": "12d65c8dd2b", "short_id": "12d65c8dd2b",
"title": "JS fix", "title": "JS fix",
"author_name": "Dmitriy Zaporozhets", "author_name": "Example User",
"author_email": "dmitriy.zaporozhets@gmail.com", "author_email": "user@example.com",
"created_at": "2014-02-27T10:27:00+02:00" "created_at": "2014-02-27T10:27:00+02:00"
}], }],
"diffs": [{ "diffs": [{
...@@ -241,11 +241,11 @@ Example response: ...@@ -241,11 +241,11 @@ Example response:
"created_at": "2014-02-27T08:03:18.000Z", "created_at": "2014-02-27T08:03:18.000Z",
"parent_ids": [], "parent_ids": [],
"message": "Initial commit\n", "message": "Initial commit\n",
"author_name": "Dmitriy Zaporozhets", "author_name": "Example User",
"author_email": "dmitriy.zaporozhets@gmail.com", "author_email": "user@example.com",
"authored_date": "2014-02-27T08:03:18.000Z", "authored_date": "2014-02-27T08:03:18.000Z",
"committer_name": "Dmitriy Zaporozhets", "committer_name": "Example User",
"committer_email": "dmitriy.zaporozhets@gmail.com", "committer_email": "user@example.com",
"committed_date": "2014-02-27T08:03:18.000Z" "committed_date": "2014-02-27T08:03:18.000Z"
} }
``` ```
...@@ -46,13 +46,13 @@ sudo -u git -H bin/rails console RAILS_ENV=production ...@@ -46,13 +46,13 @@ sudo -u git -H bin/rails console RAILS_ENV=production
Then run the following command to enable the feature flag: Then run the following command to enable the feature flag:
``` ```ruby
Feature.enable(:sourcegraph) Feature.enable(:sourcegraph)
``` ```
You can also enable the feature flag only for specific projects with: You can also enable the feature flag only for specific projects with:
``` ```ruby
Feature.enable(:sourcegraph, Project.find_by_full_path('my_group/my_project')) Feature.enable(:sourcegraph, Project.find_by_full_path('my_group/my_project'))
``` ```
......
...@@ -446,8 +446,8 @@ X-Gitlab-Event: System Hook ...@@ -446,8 +446,8 @@ X-Gitlab-Event: System Hook
"timestamp": "2013-05-13T18:18:08+00:00", "timestamp": "2013-05-13T18:18:08+00:00",
"url": "https://dev.gitlab.org/gitlab/gitlabhq/commit/c5feabde2d8cd023215af4d2ceeb7a64839fc428", "url": "https://dev.gitlab.org/gitlab/gitlabhq/commit/c5feabde2d8cd023215af4d2ceeb7a64839fc428",
"author": { "author": {
"name": "Dmitriy Zaporozhets", "name": "Example User",
"email": "dmitriy.zaporozhets@gmail.com" "email": "user@example.com"
} }
} }
], ],
......
...@@ -458,12 +458,12 @@ X-Gitlab-Event: Note Hook ...@@ -458,12 +458,12 @@ X-Gitlab-Event: Note Hook
}, },
"commit": { "commit": {
"id": "cfe32cf61b73a0d5e9f13e774abde7ff789b1660", "id": "cfe32cf61b73a0d5e9f13e774abde7ff789b1660",
"message": "Add submodule\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n", "message": "Add submodule\n\nSigned-off-by: Example User \u003cuser@example.com.com\u003e\n",
"timestamp": "2014-02-27T10:06:20+02:00", "timestamp": "2014-02-27T10:06:20+02:00",
"url": "http://example.com/gitlab-org/gitlab-test/commit/cfe32cf61b73a0d5e9f13e774abde7ff789b1660", "url": "http://example.com/gitlab-org/gitlab-test/commit/cfe32cf61b73a0d5e9f13e774abde7ff789b1660",
"author": { "author": {
"name": "Dmitriy Zaporozhets", "name": "Example User",
"email": "dmitriy.zaporozhets@gmail.com" "email": "user@example.com"
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment