diff --git a/doc/api/branches.md b/doc/api/branches.md index dc269664c59c5e8658df4fea09bdcb43d63cfabf..cd0266a05f105acfec27e6a38c7b05e8d799779b 100644 --- a/doc/api/branches.md +++ b/doc/api/branches.md @@ -100,7 +100,7 @@ Example response: ```json { - "name": "master", + "name": "main", "merged": false, "protected": true, "default": true, diff --git a/doc/api/commits.md b/doc/api/commits.md index 22c11a4054191fb849545cc27d72c8845197681b..68c453aa3178e8513e05bdba979060e7d299d075 100644 --- a/doc/api/commits.md +++ b/doc/api/commits.md @@ -120,7 +120,7 @@ POST /projects/:id/repository/commits ```shell PAYLOAD=$(cat << 'JSON' { - "branch": "master", + "branch": "main", "commit_message": "some commit message", "actions": [ { @@ -188,9 +188,9 @@ GitLab supports [form encoding](rest/index.md#encoding-api-parameters-of-array-a ```shell curl --request POST \ - --form "branch=master" \ + --form "branch=main" \ --form "commit_message=some commit message" \ - --form "start_branch=master" \ + --form "start_branch=main" \ --form "actions[][action]=create" \ --form "actions[][file_path]=foo/bar" \ --form "actions[][content]=</path/to/local.file" \ @@ -227,7 +227,7 @@ Parameters: | `stats` | boolean | no | Include commit stats. Default is true | ```shell -curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/5/repository/commits/master" +curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/5/repository/commits/main" ``` Example response: @@ -250,7 +250,7 @@ Example response: ], "last_pipeline" : { "id": 8, - "ref": "master", + "ref": "main", "sha": "2dc6aa325a317eda67812f05600bdf0fcdc70ab0", "status": "created" }, @@ -317,7 +317,7 @@ Parameters: ```shell curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" \ - --form "branch=master" "https://gitlab.example.com/api/v4/projects/5/repository/commits/master/cherry_pick" + --form "branch=main" "https://gitlab.example.com/api/v4/projects/5/repository/commits/main/cherry_pick" ``` Example response: @@ -388,7 +388,7 @@ Parameters: | `dry_run` | boolean | no | Does not commit any changes. Default is false. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/231032) in GitLab 13.3 | ```shell -curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" --form "branch=master" \ +curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" --form "branch=main" \ "https://gitlab.example.com/api/v4/projects/5/repository/commits/a738f717824ff53aebad8b090c1b79a14f2bd9e8/revert" ``` @@ -454,7 +454,7 @@ Parameters: | `sha` | string | yes | The commit hash or name of a repository branch or tag | ```shell -curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/5/repository/commits/master/diff" +curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/5/repository/commits/main/diff" ``` Example response: @@ -490,7 +490,7 @@ Parameters: | `sha` | string | yes | The commit hash or name of a repository branch or tag | ```shell -curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/5/repository/commits/master/comments" +curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/5/repository/commits/main/comments" ``` Example response: @@ -679,7 +679,7 @@ Example response: "target_url" : "https://gitlab.example.com/janedoe/gitlab-foss/builds/91", "finished_at" : null, "id" : 91, - "ref" : "master" + "ref" : "main" }, { "started_at" : null, @@ -690,7 +690,7 @@ Example response: "target_url" : "https://gitlab.example.com/janedoe/gitlab-foss/builds/90", "id" : 90, "finished_at" : null, - "ref" : "master", + "ref" : "main", "sha" : "18f3e63d05582537db6d183d9d557be09e1f90c8", "author" : { "id" : 28, @@ -789,7 +789,7 @@ Example response: "state":"opened", "created_at":"2018-03-26T17:26:30.916Z", "updated_at":"2018-03-26T17:26:30.916Z", - "target_branch":"master", + "target_branch":"main", "source_branch":"test-branch", "upvotes":0, "downvotes":0, diff --git a/doc/api/events.md b/doc/api/events.md index 9889e8d7701b94e31885de8f4382d38912086895..8564b9b094215e60cb52e5711e6a0579df81b7a0 100644 --- a/doc/api/events.md +++ b/doc/api/events.md @@ -185,7 +185,7 @@ Example response: "ref_type": "branch", "commit_from": "50d4420237a9de7be1304607147aec22e4a14af7", "commit_to": "c5feabde2d8cd023215af4d2ceeb7a64839fc428", - "ref": "master", + "ref": "main", "commit_title": "Add simple search to projects in public area" }, "target_title": null diff --git a/doc/api/group_badges.md b/doc/api/group_badges.md index fc7ec51af4d51b5bc47548134e96c527b58fd192..61a2ef4a89b5af7cf2c8efb525fbf6308d61d156 100644 --- a/doc/api/group_badges.md +++ b/doc/api/group_badges.md @@ -52,7 +52,7 @@ Example response: "id": 1, "link_url": "http://example.com/ci_status.svg?project=%{project_path}&ref=%{default_branch}", "image_url": "https://shields.io/my/badge", - "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=master", + "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=main", "rendered_image_url": "https://shields.io/my/badge", "kind": "group" } @@ -84,7 +84,7 @@ Example response: "id": 1, "link_url": "http://example.com/ci_status.svg?project=%{project_path}&ref=%{default_branch}", "image_url": "https://shields.io/my/badge", - "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=master", + "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=main", "rendered_image_url": "https://shields.io/my/badge", "kind": "group" } @@ -201,7 +201,7 @@ Example response: { "link_url": "http://example.com/ci_status.svg?project=%{project_path}&ref=%{default_branch}", "image_url": "https://shields.io/my/badge", - "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=master", + "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=main", "rendered_image_url": "https://shields.io/my/badge" } ``` diff --git a/doc/api/group_protected_branches.md b/doc/api/group_protected_branches.md index c017d0741ce131fa3a09b1e62571734171e4e41a..10b7ff92e9c4048f261cf089995e62b4fc64159c 100644 --- a/doc/api/group_protected_branches.md +++ b/doc/api/group_protected_branches.md @@ -49,7 +49,7 @@ Example response: [ { "id": 1, - "name": "master", + "name": "main", "push_access_levels": [ { "id": 1, @@ -114,7 +114,7 @@ GET /groups/:id/protected_branches/:name ```shell curl --header "PRIVATE-TOKEN: <your_access_token>" \ - "https://gitlab.example.com/api/v4/groups/5/protected_branches/master" + "https://gitlab.example.com/api/v4/groups/5/protected_branches/main" ``` Example response: @@ -122,7 +122,7 @@ Example response: ```json { "id": 1, - "name": "master", + "name": "main", "push_access_levels": [ { "id": 1, @@ -270,7 +270,7 @@ curl --request POST \ --header "PRIVATE-TOKEN: <your_access_token>" \ --header "Content-Type: application/json" \ --data '{ - "name": "master", + "name": "main", "allowed_to_push": [{"access_level": 30}], "allowed_to_merge": [{ "access_level": 30 @@ -286,7 +286,7 @@ Example response: ```json { "id": 5, - "name": "master", + "name": "main", "push_access_levels": [ { "id": 1, @@ -348,7 +348,7 @@ Example response: ```json { - "name": "master", + "name": "main", "push_access_levels": [ { "id": 12, @@ -406,14 +406,14 @@ To delete: curl --header 'Content-Type: application/json' --request PATCH \ --data '{"allowed_to_push": [{access_level: 40}]}' \ --header "PRIVATE-TOKEN: <your_access_token>" \ - "https://gitlab.example.com/api/v4/groups/22034114/protected_branches/master" + "https://gitlab.example.com/api/v4/groups/22034114/protected_branches/main" ``` Example response: ```json { - "name": "master", + "name": "main", "push_access_levels": [ { "id": 12, @@ -431,14 +431,14 @@ Example response: ```shell curl --header 'Content-Type: application/json' --request PATCH \ --data '{"allowed_to_push": [{"id": 12, "access_level": 0}]' \ - --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/groups/22034114/protected_branches/master" + --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/groups/22034114/protected_branches/main" ``` Example response: ```json { - "name": "master", + "name": "main", "push_access_levels": [ { "id": 12, @@ -456,14 +456,14 @@ Example response: ```shell curl --header 'Content-Type: application/json' --request PATCH \ --data '{"allowed_to_push": [{"id": 12, "_destroy": true}]}' \ - --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/groups/22034114/protected_branches/master" + --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/groups/22034114/protected_branches/main" ``` Example response: ```json { - "name": "master", + "name": "main", "push_access_levels": [] } ``` diff --git a/doc/api/group_wikis.md b/doc/api/group_wikis.md index 7396758ac404103a5f5ff97799951fbd11f66eb0..2d758779f79973a147456dd21a72de1cf8706a5e 100644 --- a/doc/api/group_wikis.md +++ b/doc/api/group_wikis.md @@ -207,7 +207,7 @@ Example response: { "file_name" : "dk.png", "file_path" : "uploads/6a061c4cf9f1c28cb22c384b4b8d4e3c/dk.png", - "branch" : "master", + "branch" : "main", "link" : { "url" : "uploads/6a061c4cf9f1c28cb22c384b4b8d4e3c/dk.png", "markdown" : "" diff --git a/doc/api/groups.md b/doc/api/groups.md index 4888633e1c867e414b62e4c40a1eeccea1f2010a..9ea37f4bb7c2d90033a336d225f5a07af68fe090 100644 --- a/doc/api/groups.md +++ b/doc/api/groups.md @@ -327,7 +327,7 @@ Example response: { "id": 9, "description": "foo", - "default_branch": "master", + "default_branch": "main", "tag_list": [], //deprecated, use `topics` instead "topics": [], "archived": false, @@ -407,13 +407,13 @@ Example response: "path":"html5-boilerplate", "path_with_namespace":"h5bp/html5-boilerplate", "created_at":"2020-04-27T06:13:22.642Z", - "default_branch":"master", + "default_branch":"main", "tag_list":[], //deprecated, use `topics` instead "topics":[], "ssh_url_to_repo":"ssh://git@gitlab.com/h5bp/html5-boilerplate.git", "http_url_to_repo":"https://gitlab.com/h5bp/html5-boilerplate.git", "web_url":"https://gitlab.com/h5bp/html5-boilerplate", - "readme_url":"https://gitlab.com/h5bp/html5-boilerplate/-/blob/master/README.md", + "readme_url":"https://gitlab.com/h5bp/html5-boilerplate/-/blob/main/README.md", "avatar_url":null, "star_count":0, "forks_count":4, @@ -573,7 +573,7 @@ Example response: { "id": 7, "description": "Voluptas veniam qui et beatae voluptas doloremque explicabo facilis.", - "default_branch": "master", + "default_branch": "main", "tag_list": [], //deprecated, use `topics` instead "topics": [], "archived": false, @@ -612,7 +612,7 @@ Example response: { "id": 6, "description": "Aspernatur omnis repudiandae qui voluptatibus eaque.", - "default_branch": "master", + "default_branch": "main", "tag_list": [], //deprecated, use `topics` instead "topics": [], "archived": false, @@ -653,7 +653,7 @@ Example response: { "id": 8, "description": "Velit eveniet provident fugiat saepe eligendi autem.", - "default_branch": "master", + "default_branch": "main", "tag_list": [], //deprecated, use `topics` instead "topics": [], "archived": false, @@ -1039,7 +1039,7 @@ Example response: { "id": 9, "description": "foo", - "default_branch": "master", + "default_branch": "main", "tag_list": [], //deprecated, use `topics` instead "topics": [], "public": false, diff --git a/doc/api/issues.md b/doc/api/issues.md index 27415d4ba22f9456f1148a1d42022680e73ecc0f..07678f3ca42eec64e8f87d71e4d75b05ef741e52 100644 --- a/doc/api/issues.md +++ b/doc/api/issues.md @@ -2337,7 +2337,7 @@ Example response: "state": "opened", "created_at": "2017-04-06T18:33:34.168Z", "updated_at": "2017-04-09T20:10:24.983Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "feature.custom-highlighting", "upvotes": 0, "downvotes": 0, diff --git a/doc/api/merge_request_approvals.md b/doc/api/merge_request_approvals.md index d64c71367a92897371b47fefe50cc201efd502b8..d00252da207be51650efa31379ade46589d3a4b7 100644 --- a/doc/api/merge_request_approvals.md +++ b/doc/api/merge_request_approvals.md @@ -162,7 +162,7 @@ Supported attributes: "protected_branches": [ { "id": 1, - "name": "master", + "name": "main", "push_access_levels": [ { "access_level": 30, @@ -264,7 +264,7 @@ Supported attributes: "protected_branches": [ { "id": 1, - "name": "master", + "name": "main", "push_access_levels": [ { "access_level": 30, @@ -374,7 +374,7 @@ Supported attributes: "protected_branches": [ { "id": 1, - "name": "master", + "name": "main", "push_access_levels": [ { "access_level": 30, @@ -508,7 +508,7 @@ Supported attributes: "protected_branches": [ { "id": 1, - "name": "master", + "name": "main", "push_access_levels": [ { "access_level": 30, diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index fc003e6936351b29e9d237a3d04d130f9d1a69da..53a605c56f09554b2afae9437ee417ffc13922c4 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -114,7 +114,7 @@ Supported attributes: "closed_at": null, "created_at": "2017-04-29T08:46:00Z", "updated_at": "2017-04-29T08:46:00Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "test1", "upvotes": 0, "downvotes": 0, @@ -303,7 +303,7 @@ Supported attributes: "closed_at": null, "created_at": "2017-04-29T08:46:00Z", "updated_at": "2017-04-29T08:46:00Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "test1", "upvotes": 0, "downvotes": 0, @@ -479,7 +479,7 @@ Supported attributes: "closed_at": null, "created_at": "2017-04-29T08:46:00Z", "updated_at": "2017-04-29T08:46:00Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "test1", "upvotes": 0, "downvotes": 0, @@ -672,7 +672,7 @@ Supported attributes: "prepared_at": "2018-09-04T11:16:17.520Z", "closed_by": null, "closed_at": null, - "target_branch": "master", + "target_branch": "main", "source_branch": "manual-job-rules", "user_notes_count": 0, "upvotes": 0, @@ -1179,7 +1179,7 @@ Supported attributes: { "id": 77, "sha": "959e04d7c7a30600c894bd3c0cd0e1ce7f42c11d", - "ref": "master", + "ref": "main", "status": "success" } ] @@ -1284,7 +1284,7 @@ POST /projects/:id/merge_requests "state": "merged", "created_at": "2017-04-29T08:46:00Z", "updated_at": "2017-04-29T08:46:00Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "test1", "upvotes": 0, "downvotes": 0, @@ -1439,7 +1439,7 @@ Must include at least one non-required attribute from above. "state": "merged", "created_at": "2017-04-29T08:46:00Z", "updated_at": "2017-04-29T08:46:00Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "test1", "upvotes": 0, "downvotes": 0, @@ -1617,7 +1617,7 @@ Supported attributes: "state": "merged", "created_at": "2017-04-29T08:46:00Z", "updated_at": "2017-04-29T08:46:00Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "test1", "upvotes": 0, "downvotes": 0, @@ -1819,7 +1819,7 @@ Supported attributes: "state": "merged", "created_at": "2017-04-29T08:46:00Z", "updated_at": "2017-04-29T08:46:00Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "test1", "upvotes": 0, "downvotes": 0, @@ -2121,7 +2121,7 @@ Example response: "state": "merged", "created_at": "2017-04-29T08:46:00Z", "updated_at": "2017-04-29T08:46:00Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "test1", "upvotes": 0, "downvotes": 0, @@ -2281,7 +2281,7 @@ Example response: "state": "merged", "created_at": "2017-04-29T08:46:00Z", "updated_at": "2017-04-29T08:46:00Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "test1", "upvotes": 0, "downvotes": 0, diff --git a/doc/api/packages.md b/doc/api/packages.md index ac692956f221418ce7e5bc1cbf2dd96b0c526a9b..a378be26a24b224e6a962f38daa544c1ad4ef6dc 100644 --- a/doc/api/packages.md +++ b/doc/api/packages.md @@ -380,7 +380,7 @@ Example response: "iid": 2, "project_id": 9, "sha": "e564015ac6cb3d8617647802c875b27d392f72a6", - "ref": "master", + "ref": "main", "status": "canceled", "source": "push", "created_at": "2023-02-01T12:23:23.694Z", diff --git a/doc/api/project_badges.md b/doc/api/project_badges.md index 5c621bf6426a6f0197d7430c012ad028b1137cc2..d615df112cf57579440db21bee75729de0c687f4 100644 --- a/doc/api/project_badges.md +++ b/doc/api/project_badges.md @@ -47,7 +47,7 @@ Example response: "id": 1, "link_url": "http://example.com/ci_status.svg?project=%{project_path}&ref=%{default_branch}", "image_url": "https://shields.io/my/badge", - "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=master", + "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=main", "rendered_image_url": "https://shields.io/my/badge", "kind": "project" }, @@ -56,7 +56,7 @@ Example response: "id": 2, "link_url": "http://example.com/ci_status.svg?project=%{project_path}&ref=%{default_branch}", "image_url": "https://shields.io/my/badge", - "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=master", + "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=main", "rendered_image_url": "https://shields.io/my/badge", "kind": "group" } @@ -88,7 +88,7 @@ Example response: "id": 1, "link_url": "http://example.com/ci_status.svg?project=%{project_path}&ref=%{default_branch}", "image_url": "https://shields.io/my/badge", - "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=master", + "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=main", "rendered_image_url": "https://shields.io/my/badge", "kind": "project" } @@ -111,7 +111,7 @@ POST /projects/:id/badges ```shell curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" \ - --data "link_url=https://gitlab.com/gitlab-org/gitlab-foss/commits/master&image_url=https://shields.io/my/badge1&name=mybadge" \ + --data "link_url=https://gitlab.com/gitlab-org/gitlab-foss/commits/main&image_url=https://shields.io/my/badge1&name=mybadge" \ "https://gitlab.example.com/api/v4/projects/:id/badges" ``` @@ -121,9 +121,9 @@ Example response: { "id": 1, "name": "mybadge", - "link_url": "https://gitlab.com/gitlab-org/gitlab-foss/commits/master", + "link_url": "https://gitlab.com/gitlab-org/gitlab-foss/commits/main", "image_url": "https://shields.io/my/badge1", - "rendered_link_url": "https://gitlab.com/gitlab-org/gitlab-foss/commits/master", + "rendered_link_url": "https://gitlab.com/gitlab-org/gitlab-foss/commits/main", "rendered_image_url": "https://shields.io/my/badge1", "kind": "project" } @@ -155,9 +155,9 @@ Example response: { "id": 1, "name": "mybadge", - "link_url": "https://gitlab.com/gitlab-org/gitlab-foss/commits/master", + "link_url": "https://gitlab.com/gitlab-org/gitlab-foss/commits/main", "image_url": "https://shields.io/my/badge", - "rendered_link_url": "https://gitlab.com/gitlab-org/gitlab-foss/commits/master", + "rendered_link_url": "https://gitlab.com/gitlab-org/gitlab-foss/commits/main", "rendered_image_url": "https://shields.io/my/badge", "kind": "project" } @@ -204,7 +204,7 @@ Example response: { "link_url": "http://example.com/ci_status.svg?project=%{project_path}&ref=%{default_branch}", "image_url": "https://shields.io/my/badge", - "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=master", + "rendered_link_url": "http://example.com/ci_status.svg?project=example-org/example-project&ref=main", "rendered_image_url": "https://shields.io/my/badge" } ``` diff --git a/doc/api/project_vulnerabilities.md b/doc/api/project_vulnerabilities.md index c38ee31ddfc417508d7599bfe3b35efd005930a9..2b4d3ec50dfd69bdf9f4d392d4b332094ef9430e 100644 --- a/doc/api/project_vulnerabilities.md +++ b/doc/api/project_vulnerabilities.md @@ -90,7 +90,7 @@ Example response: "path": "security-reports", "path_with_namespace": "gitlab-org/security-reports" }, - "project_default_branch": "master", + "project_default_branch": "main", "report_type": "dependency_scanning", "resolved_at": null, "resolved_by_id": null, @@ -178,7 +178,7 @@ Example response: "path": "security-reports", "path_with_namespace": "gitlab-org/security-reports" }, - "project_default_branch": "master", + "project_default_branch": "main", "report_type": "dependency_scanning", "resolved_at": null, "resolved_by_id": null, diff --git a/doc/api/projects.md b/doc/api/projects.md index 7ae9c599ce24e322cdb4d1ceea6002ebf1e98e52..2c00e1cbdc8173abc69813900b016b334fd081e1 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -162,7 +162,7 @@ When the user is authenticated and `simple` is not set this returns something li "ssh_url_to_repo": "git@gitlab.example.com:diaspora/diaspora-client.git", "http_url_to_repo": "https://gitlab.example.com/diaspora/diaspora-client.git", "web_url": "https://gitlab.example.com/diaspora/diaspora-client", - "readme_url": "https://gitlab.example.com/diaspora/diaspora-client/blob/master/README.md", + "readme_url": "https://gitlab.example.com/diaspora/diaspora-client/blob/main/README.md", "avatar_url": "https://gitlab.example.com/uploads/project/avatar/4/uploads/avatar.png", "forks_count": 0, "star_count": 0, @@ -349,12 +349,12 @@ GET /users/:user_id/projects "id": 4, "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", "description_html": "<p data-sourcepos=\"1:1-1:56\" dir=\"auto\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>", - "default_branch": "master", + "default_branch": "main", "visibility": "private", "ssh_url_to_repo": "git@example.com:diaspora/diaspora-client.git", "http_url_to_repo": "http://example.com/diaspora/diaspora-client.git", "web_url": "http://example.com/diaspora/diaspora-client", - "readme_url": "http://example.com/diaspora/diaspora-client/blob/master/README.md", + "readme_url": "http://example.com/diaspora/diaspora-client/blob/main/README.md", "tag_list": [ //deprecated, use `topics` instead "example", "disapora client" @@ -457,12 +457,12 @@ GET /users/:user_id/projects "id": 6, "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", "description_html": "<p data-sourcepos=\"1:1-1:56\" dir=\"auto\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>", - "default_branch": "master", + "default_branch": "main", "visibility": "private", "ssh_url_to_repo": "git@example.com:brightbox/puppet.git", "http_url_to_repo": "http://example.com/brightbox/puppet.git", "web_url": "http://example.com/brightbox/puppet", - "readme_url": "http://example.com/brightbox/puppet/blob/master/README.md", + "readme_url": "http://example.com/brightbox/puppet/blob/main/README.md", "tag_list": [ //deprecated, use `topics` instead "example", "puppet" @@ -613,12 +613,12 @@ Example response: "id": 4, "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", "description_html": "<p data-sourcepos=\"1:1-1:56\" dir=\"auto\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>", - "default_branch": "master", + "default_branch": "main", "visibility": "private", "ssh_url_to_repo": "git@example.com:diaspora/diaspora-client.git", "http_url_to_repo": "http://example.com/diaspora/diaspora-client.git", "web_url": "http://example.com/diaspora/diaspora-client", - "readme_url": "http://example.com/diaspora/diaspora-client/blob/master/README.md", + "readme_url": "http://example.com/diaspora/diaspora-client/blob/main/README.md", "tag_list": [ //deprecated, use `topics` instead "example", "disapora client" @@ -709,12 +709,12 @@ Example response: "id": 6, "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", "description_html": "<p data-sourcepos=\"1:1-1:56\" dir=\"auto\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>", - "default_branch": "master", + "default_branch": "main", "visibility": "private", "ssh_url_to_repo": "git@example.com:brightbox/puppet.git", "http_url_to_repo": "http://example.com/brightbox/puppet.git", "web_url": "http://example.com/brightbox/puppet", - "readme_url": "http://example.com/brightbox/puppet/blob/master/README.md", + "readme_url": "http://example.com/brightbox/puppet/blob/main/README.md", "tag_list": [ //deprecated, use `topics` instead "example", "puppet" @@ -871,12 +871,12 @@ Example response: "id": 4, "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", "description_html": "<p data-sourcepos=\"1:1-1:56\" dir=\"auto\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>", - "default_branch": "master", + "default_branch": "main", "visibility": "private", "ssh_url_to_repo": "git@example.com:diaspora/diaspora-client.git", "http_url_to_repo": "http://example.com/diaspora/diaspora-client.git", "web_url": "http://example.com/diaspora/diaspora-client", - "readme_url": "http://example.com/diaspora/diaspora-client/blob/master/README.md", + "readme_url": "http://example.com/diaspora/diaspora-client/blob/main/README.md", "tag_list": [ //deprecated, use `topics` instead "example", "disapora client" @@ -967,12 +967,12 @@ Example response: "id": 6, "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", "description_html": "<p data-sourcepos=\"1:1-1:56\" dir=\"auto\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>", - "default_branch": "master", + "default_branch": "main", "visibility": "private", "ssh_url_to_repo": "git@example.com:brightbox/puppet.git", "http_url_to_repo": "http://example.com/brightbox/puppet.git", "web_url": "http://example.com/brightbox/puppet", - "readme_url": "http://example.com/brightbox/puppet/blob/master/README.md", + "readme_url": "http://example.com/brightbox/puppet/blob/main/README.md", "tag_list": [ //deprecated, use `topics` instead "example", "puppet" @@ -1109,12 +1109,12 @@ GET /projects/:id "id": 3, "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", "description_html": "<p data-sourcepos=\"1:1-1:56\" dir=\"auto\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>", - "default_branch": "master", + "default_branch": "main", "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", + "readme_url": "http://example.com/diaspora/diaspora-project-site/blob/main/README.md", "tag_list": [ //deprecated, use `topics` instead "example", "disapora project" @@ -1182,7 +1182,7 @@ GET /projects/:id }, "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_url": "http://example.com/diaspora/diaspora-client/blob/main/LICENSE", "license": { "key": "lgpl-3.0", "name": "GNU Lesser General Public License v3.0", @@ -1305,14 +1305,14 @@ target the upstream project by default. "path":"gitlab-foss", "path_with_namespace":"gitlab-org/gitlab-foss", "created_at":"2013-09-26T06:02:36.000Z", - "default_branch":"master", + "default_branch":"main", "tag_list":[], //deprecated, use `topics` instead "topics":[], "ssh_url_to_repo":"git@gitlab.com:gitlab-org/gitlab-foss.git", "http_url_to_repo":"https://gitlab.com/gitlab-org/gitlab-foss.git", "web_url":"https://gitlab.com/gitlab-org/gitlab-foss", "avatar_url":"https://gitlab.com/uploads/-/system/project/avatar/13083/logo-extra-whitespace.png", - "license_url": "https://gitlab.com/gitlab-org/gitlab/-/blob/master/LICENSE", + "license_url": "https://gitlab.com/gitlab-org/gitlab/-/blob/main/LICENSE", "license": { "key": "mit", "name": "MIT License", @@ -1835,12 +1835,12 @@ Example responses: "id": 3, "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", "description_html": "<p data-sourcepos=\"1:1-1:56\" dir=\"auto\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>", - "default_branch": "master", + "default_branch": "main", "visibility": "internal", "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", + "readme_url": "http://example.com/diaspora/diaspora-project-site/blob/main/README.md", "tag_list": [ //deprecated, use `topics` instead "example", "disapora project" @@ -1937,12 +1937,12 @@ Example response: "id": 3, "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", "description_html": "<p data-sourcepos=\"1:1-1:56\" dir=\"auto\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>", - "default_branch": "master", + "default_branch": "main", "visibility": "internal", "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", + "readme_url": "http://example.com/diaspora/diaspora-project-site/blob/main/README.md", "tag_list": [ //deprecated, use `topics` instead "example", "disapora project" @@ -1980,7 +1980,7 @@ Example response: "import_status": "none", "archived": true, "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png", - "license_url": "http://example.com/diaspora/diaspora-client/blob/master/LICENSE", + "license_url": "http://example.com/diaspora/diaspora-client/blob/main/LICENSE", "license": { "key": "lgpl-3.0", "name": "GNU Lesser General Public License v3.0", @@ -2045,12 +2045,12 @@ Example response: "id": 3, "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", "description_html": "<p data-sourcepos=\"1:1-1:56\" dir=\"auto\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>", - "default_branch": "master", + "default_branch": "main", "visibility": "internal", "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", + "readme_url": "http://example.com/diaspora/diaspora-project-site/blob/main/README.md", "tag_list": [ //deprecated, use `topics` instead "example", "disapora project" @@ -2088,7 +2088,7 @@ Example response: "import_status": "none", "archived": true, "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png", - "license_url": "http://example.com/diaspora/diaspora-client/blob/master/LICENSE", + "license_url": "http://example.com/diaspora/diaspora-client/blob/main/LICENSE", "license": { "key": "lgpl-3.0", "name": "GNU Lesser General Public License v3.0", @@ -2228,12 +2228,12 @@ Example response: "id": 3, "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", "description_html": "<p data-sourcepos=\"1:1-1:56\" dir=\"auto\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>", - "default_branch": "master", + "default_branch": "main", "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", + "readme_url": "http://example.com/diaspora/diaspora-project-site/blob/main/README.md", "tag_list": [ //deprecated, use `topics` instead "example", "disapora project" @@ -2287,7 +2287,7 @@ Example response: }, "archived": true, "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png", - "license_url": "http://example.com/diaspora/diaspora-client/blob/master/LICENSE", + "license_url": "http://example.com/diaspora/diaspora-client/blob/main/LICENSE", "license": { "key": "lgpl-3.0", "name": "GNU Lesser General Public License v3.0", @@ -2360,12 +2360,12 @@ Example response: "id": 3, "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", "description_html": "<p data-sourcepos=\"1:1-1:56\" dir=\"auto\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>", - "default_branch": "master", + "default_branch": "main", "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", + "readme_url": "http://example.com/diaspora/diaspora-project-site/blob/main/README.md", "tag_list": [ //deprecated, use `topics` instead "example", "disapora project" @@ -2419,7 +2419,7 @@ Example response: }, "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_url": "http://example.com/diaspora/diaspora-client/blob/main/LICENSE", "license": { "key": "lgpl-3.0", "name": "GNU Lesser General Public License v3.0", @@ -3051,13 +3051,13 @@ Example response: "path_with_namespace": "cute-cats/hello-world", "created_at": "2020-10-15T16:25:22.415Z", "updated_at": "2020-10-15T16:25:22.415Z", - "default_branch": "master", + "default_branch": "main", "tag_list": [], //deprecated, use `topics` instead "topics": [], "ssh_url_to_repo": "git@gitlab.example.com:cute-cats/hello-world.git", "http_url_to_repo": "https://gitlab.example.com/cute-cats/hello-world.git", "web_url": "https://gitlab.example.com/cute-cats/hello-world", - "readme_url": "https://gitlab.example.com/cute-cats/hello-world/-/blob/master/README.md", + "readme_url": "https://gitlab.example.com/cute-cats/hello-world/-/blob/main/README.md", "avatar_url": null, "forks_count": 0, "star_count": 0, diff --git a/doc/api/repositories.md b/doc/api/repositories.md index 642c07ae4ea1e1d35c77bea27627f415a3e09bef..aae475a0356bdb0a248f46b7bbfe4848dcb9bc47 100644 --- a/doc/api/repositories.md +++ b/doc/api/repositories.md @@ -189,7 +189,7 @@ Supported attributes: | `straight` | boolean | no | Comparison method: `true` for direct comparison between `from` and `to` (`from`..`to`), `false` to compare using merge base (`from`...`to`)'. Default is `false`. | ```plaintext -GET /projects/:id/repository/compare?from=master&to=feature +GET /projects/:id/repository/compare?from=main&to=feature ``` Example response: diff --git a/doc/api/repository_files.md b/doc/api/repository_files.md index 969470dcc54b6275c884c264f55e1235bdee19d7..cc0b4ea197283a63b8fa2a62080a1e4d94459b94 100644 --- a/doc/api/repository_files.md +++ b/doc/api/repository_files.md @@ -35,7 +35,7 @@ GET /projects/:id/repository/files/:file_path ``` ```shell -curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/13083/repository/files/app%2Fmodels%2Fkey%2Erb?ref=master" +curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/13083/repository/files/app%2Fmodels%2Fkey%2Erb?ref=main" ``` | Attribute | Type | Required | Description | @@ -54,7 +54,7 @@ Example response: "encoding": "base64", "content": "IyA9PSBTY2hlbWEgSW5mb3...", "content_sha256": "4c294617b60715c1d218e61164a3abd4808a4284cbc30e6728a01ad9aada4481", - "ref": "master", + "ref": "main", "blob_id": "79f7bbd25901e8334750839545a9bd021f0e4c83", "commit_id": "d5a3ff139356ce33e37e73add446f16869741b50", "last_commit_id": "570e7b2abdd848b95f2f578043fc23bd6f6fd24d", @@ -73,7 +73,7 @@ HEAD /projects/:id/repository/files/:file_path ``` ```shell -curl --head --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/13083/repository/files/app%2Fmodels%2Fkey%2Erb?ref=master" +curl --head --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/13083/repository/files/app%2Fmodels%2Fkey%2Erb?ref=main" ``` Example response: @@ -88,7 +88,7 @@ X-Gitlab-Encoding: base64 X-Gitlab-File-Name: key.rb X-Gitlab-File-Path: app/models/key.rb X-Gitlab-Last-Commit-Id: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d -X-Gitlab-Ref: master +X-Gitlab-Ref: main X-Gitlab-Size: 1476 X-Gitlab-Execute-Filemode: false ... @@ -112,7 +112,7 @@ GET /projects/:id/repository/files/:file_path/blame | `range` | hash | no | Blame range. | ```shell -curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/13083/repository/files/path%2Fto%2Ffile.rb/blame?ref=master" +curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/13083/repository/files/path%2Fto%2Ffile.rb/blame?ref=main" ``` Example response: @@ -147,7 +147,7 @@ NOTE: `HEAD` method returns just file metadata, as in [Get file from repository](repository_files.md#get-file-from-repository). ```shell -curl --head --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/13083/repository/files/path%2Fto%2Ffile.rb/blame?ref=master" +curl --head --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/13083/repository/files/path%2Fto%2Ffile.rb/blame?ref=main" ``` Example response: @@ -162,7 +162,7 @@ X-Gitlab-Encoding: base64 X-Gitlab-File-Name: file.rb X-Gitlab-File-Path: path/to/file.rb X-Gitlab-Last-Commit-Id: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d -X-Gitlab-Ref: master +X-Gitlab-Ref: main X-Gitlab-Size: 1476 X-Gitlab-Execute-Filemode: false ... @@ -174,7 +174,7 @@ To request a blame range, specify `range[start]` and `range[end]` parameters wit the starting and ending line numbers of the file. ```shell -curl --head --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/13083/repository/files/path%2Fto%2Ffile.rb/blame?ref=master&range[start]=1&range[end]=2" +curl --head --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/13083/repository/files/path%2Fto%2Ffile.rb/blame?ref=main&range[start]=1&range[end]=2" ``` Example response: @@ -218,7 +218,7 @@ GET /projects/:id/repository/files/:file_path/raw | `lfs` | boolean | no | Determines if the response should be Git LFS file contents, rather than the pointer. If the file is not tracked by Git LFS, ignored. Defaults to `false`. | ```shell -curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/13083/repository/files/app%2Fmodels%2Fkey%2Erb/raw?ref=master" +curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/13083/repository/files/app%2Fmodels%2Fkey%2Erb/raw?ref=main" ``` NOTE: @@ -251,7 +251,7 @@ POST /projects/:id/repository/files/:file_path ```shell curl --request POST --header 'PRIVATE-TOKEN: <your_access_token>' \ --header "Content-Type: application/json" \ - --data '{"branch": "master", "author_email": "author@example.com", "author_name": "Firstname Lastname", + --data '{"branch": "main", "author_email": "author@example.com", "author_name": "Firstname Lastname", "content": "some content", "commit_message": "create a new file"}' \ "https://gitlab.example.com/api/v4/projects/13083/repository/files/app%2Fproject%2Erb" ``` @@ -261,7 +261,7 @@ Example response: ```json { "file_path": "app/project.rb", - "branch": "master" + "branch": "main" } ``` @@ -293,7 +293,7 @@ PUT /projects/:id/repository/files/:file_path ```shell curl --request PUT --header 'PRIVATE-TOKEN: <your_access_token>' \ --header "Content-Type: application/json" \ - --data '{"branch": "master", "author_email": "author@example.com", "author_name": "Firstname Lastname", + --data '{"branch": "main", "author_email": "author@example.com", "author_name": "Firstname Lastname", "content": "some content", "commit_message": "update file"}' \ "https://gitlab.example.com/api/v4/projects/13083/repository/files/app%2Fproject%2Erb" ``` @@ -303,7 +303,7 @@ Example response: ```json { "file_path": "app/project.rb", - "branch": "master" + "branch": "main" } ``` @@ -339,7 +339,7 @@ DELETE /projects/:id/repository/files/:file_path ```shell curl --request DELETE --header 'PRIVATE-TOKEN: <your_access_token>' \ --header "Content-Type: application/json" \ - --data '{"branch": "master", "author_email": "author@example.com", "author_name": "Firstname Lastname", + --data '{"branch": "main", "author_email": "author@example.com", "author_name": "Firstname Lastname", "commit_message": "delete file"}' \ "https://gitlab.example.com/api/v4/projects/13083/repository/files/app%2Fproject%2Erb" ``` diff --git a/doc/api/repository_submodules.md b/doc/api/repository_submodules.md index 650dc7783b8b867605d76ae76350992f6c3003cd..7ed8e0bd33a87fef21ca6c01fda61d09bdda058c 100644 --- a/doc/api/repository_submodules.md +++ b/doc/api/repository_submodules.md @@ -27,7 +27,7 @@ PUT /projects/:id/repository/submodules/:submodule ```shell curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/5/repository/submodules/lib%2Fmodules%2Fexample" \ ---data "branch=master&commit_sha=3ddec28ea23acc5caa5d8331a6ecb2a65fc03e88&commit_message=Update submodule reference" +--data "branch=main&commit_sha=3ddec28ea23acc5caa5d8331a6ecb2a65fc03e88&commit_message=Update submodule reference" ``` Example response: diff --git a/doc/api/runners.md b/doc/api/runners.md index 7c2bceb70eb647745a888cd0ade78f13ec5b5fa0..dba37edcb01b0c1fc38bb3a3fcd57c4a41156e08 100644 --- a/doc/api/runners.md +++ b/doc/api/runners.md @@ -395,7 +395,7 @@ Example response: "status": "running", "stage": "test", "name": "test", - "ref": "master", + "ref": "main", "tag": false, "coverage": null, "created_at": "2017-11-16T08:50:29.000Z", @@ -439,7 +439,7 @@ Example response: "pipeline": { "id": 2, "sha": "97de212e80737a608d939f648d959671fb0a0142", - "ref": "master", + "ref": "main", "status": "running" }, "project": { diff --git a/doc/api/search.md b/doc/api/search.md index 06e62d285343d5f3a1a38cce79c003c03cb21871..4a271d9ebdcaba1d92ff0037354f47e009f71594 100644 --- a/doc/api/search.md +++ b/doc/api/search.md @@ -53,13 +53,13 @@ Example response: "path": "flight", "path_with_namespace": "twitter/flight", "created_at": "2017-09-05T07:58:01.621Z", - "default_branch": "master", + "default_branch": "main", "tag_list":[], //deprecated, use `topics` instead "topics":[], "ssh_url_to_repo": "ssh://jarka@localhost:2222/twitter/flight.git", "http_url_to_repo": "http://localhost:3000/twitter/flight.git", "web_url": "http://localhost:3000/twitter/flight", - "readme_url": "http://localhost:3000/twitter/flight/-/blob/master/README.md", + "readme_url": "http://localhost:3000/twitter/flight/-/blob/main/README.md", "avatar_url": null, "star_count": 0, "forks_count": 0, @@ -153,7 +153,7 @@ Example response: "state": "opened", "created_at": "2018-01-22T14:21:50.830Z", "updated_at": "2018-02-06T12:40:33.295Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "jaja-test", "upvotes": 0, "downvotes": 0, @@ -290,7 +290,7 @@ Example response: "path": "home.md", "filename": "home.md", "id": null, - "ref": "master", + "ref": "main", "startline": 5, "project_id": 6, "group_id": null @@ -367,7 +367,7 @@ Example response: "path": "README.md", "filename": "README.md", "id": null, - "ref": "master", + "ref": "main", "startline": 46, "project_id": 6 } @@ -475,13 +475,13 @@ Example response: "path": "flight", "path_with_namespace": "twitter/flight", "created_at": "2017-09-05T07:58:01.621Z", - "default_branch": "master", + "default_branch": "main", "tag_list":[], //deprecated, use `topics` instead "topics":[], "ssh_url_to_repo": "ssh://jarka@localhost:2222/twitter/flight.git", "http_url_to_repo": "http://localhost:3000/twitter/flight.git", "web_url": "http://localhost:3000/twitter/flight", - "readme_url": "http://localhost:3000/twitter/flight/-/blob/master/README.md", + "readme_url": "http://localhost:3000/twitter/flight/-/blob/main/README.md", "avatar_url": null, "star_count": 0, "forks_count": 0, @@ -575,7 +575,7 @@ Example response: "state": "opened", "created_at": "2018-01-22T14:21:50.830Z", "updated_at": "2018-02-06T12:40:33.295Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "jaja-test", "upvotes": 0, "downvotes": 0, @@ -681,7 +681,7 @@ Example response: "path": "home.md", "filename": "home.md", "id": null, - "ref": "master", + "ref": "main", "startline": 5, "project_id": 6, "group_id": 1 @@ -758,7 +758,7 @@ Example response: "path": "README.md", "filename": "README.md", "id": null, - "ref": "master", + "ref": "main", "startline": 46, "project_id": 6 } @@ -934,7 +934,7 @@ Example response: "state": "opened", "created_at": "2018-01-22T14:21:50.830Z", "updated_at": "2018-02-06T12:40:33.295Z", - "target_branch": "master", + "target_branch": "main", "source_branch": "jaja-test", "upvotes": 0, "downvotes": 0, @@ -1094,7 +1094,7 @@ Example response: "path": "home.md", "filename": "home.md", "id": null, - "ref": "master", + "ref": "main", "startline": 5, "project_id": 6, "group_id": 1 @@ -1177,7 +1177,7 @@ Example response: "path": "README.md", "filename": "README.md", "id": null, - "ref": "master", + "ref": "main", "startline": 46, "project_id": 6 } diff --git a/doc/api/snippets.md b/doc/api/snippets.md index 6fa6be3a43bdadc6e29ca6989a746bdc4f495206..84b1baab6c4c1d4338fa7895722cdf4052058243 100644 --- a/doc/api/snippets.md +++ b/doc/api/snippets.md @@ -184,7 +184,7 @@ Parameters: Example request: ```shell -curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/snippets/1/files/master/snippet%2Erb/raw" +curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/snippets/1/files/main/snippet%2Erb/raw" ``` Example response: @@ -270,7 +270,7 @@ Example response: "files": [ { "path": "text.txt", - "raw_url": "https://gitlab.example.com/-/snippets/1/raw/master/renamed.md" + "raw_url": "https://gitlab.example.com/-/snippets/1/raw/main/renamed.md" } ] } @@ -355,7 +355,7 @@ Example response: "files": [ { "path": "renamed.md", - "raw_url": "https://gitlab.example.com/-/snippets/1/raw/master/renamed.md" + "raw_url": "https://gitlab.example.com/-/snippets/1/raw/main/renamed.md" } ] } diff --git a/doc/api/status_checks.md b/doc/api/status_checks.md index c988f8d63fc60c89b86ccabc4fdd23454df024ac..3ed3755732f9e2061ec465b9391d6a85b620a4e9 100644 --- a/doc/api/status_checks.md +++ b/doc/api/status_checks.md @@ -35,7 +35,7 @@ GET /projects/:id/external_status_checks { "id": 14, "project_id": 6, - "name": "master", + "name": "main", "created_at": "2020-10-12T14:04:50.787Z", "updated_at": "2020-10-12T14:04:50.787Z", "code_owner_approval_required": false @@ -216,7 +216,7 @@ In case status check is already passed status code is 422 "namespace": "Flightjs", "visibility_level": 20, "path_with_namespace": "flightjs/Flight", - "default_branch": "master", + "default_branch": "main", "ci_config_path": null, "homepage": "http://example.com/flightjs/Flight", "url": "ssh://example.com/flightjs/Flight.git", @@ -242,10 +242,10 @@ In case status check is already passed status code is 422 "merge_user_id": null, "merge_when_pipeline_succeeds": false, "milestone_id": null, - "source_branch": "root-master-patch-30152", + "source_branch": "root-main-patch-30152", "source_project_id": 6, "state_id": 1, - "target_branch": "master", + "target_branch": "main", "target_project_id": 6, "time_estimate": 0, "title": "Update README.md", @@ -263,7 +263,7 @@ In case status check is already passed status code is 422 "namespace": "Flightjs", "visibility_level": 20, "path_with_namespace": "flightjs/Flight", - "default_branch": "master", + "default_branch": "main", "ci_config_path": null, "homepage": "http://example.com/flightjs/Flight", "url": "ssh://example.com/flightjs/Flight.git", @@ -281,7 +281,7 @@ In case status check is already passed status code is 422 "namespace": "Flightjs", "visibility_level": 20, "path_with_namespace": "flightjs/Flight", - "default_branch": "master", + "default_branch": "main", "ci_config_path": null, "homepage": "http://example.com/flightjs/Flight", "url": "ssh://example.com/flightjs/Flight.git", diff --git a/doc/api/tags.md b/doc/api/tags.md index 4cc6c80bf208e501fb7c400692961b9ea951100e..cc4ff7be577156b2866ba17ec850436f25403d2c 100644 --- a/doc/api/tags.md +++ b/doc/api/tags.md @@ -137,7 +137,7 @@ Parameters: ```shell curl --request POST \ --header "PRIVATE-TOKEN: <your_access_token>" \ - --url "https://gitlab.example.com/api/v4/projects/5/repository/tags?tag_name=test&ref=master" + --url "https://gitlab.example.com/api/v4/projects/5/repository/tags?tag_name=test&ref=main" ``` Example response: diff --git a/doc/api/wikis.md b/doc/api/wikis.md index 3a5b8b075f581af34951134916840fb6cd63557e..c33d66a14e43fcd5ab5a1942aa7c51c9eac84aa1 100644 --- a/doc/api/wikis.md +++ b/doc/api/wikis.md @@ -203,7 +203,7 @@ Example response: { "file_name" : "dk.png", "file_path" : "uploads/6a061c4cf9f1c28cb22c384b4b8d4e3c/dk.png", - "branch" : "master", + "branch" : "main", "link" : { "url" : "uploads/6a061c4cf9f1c28cb22c384b4b8d4e3c/dk.png", "markdown" : ""