Skip to content

Commit 9fe1ba3

Browse files
authored
Merge pull request #1526 from plone/plone-restapi-main
Use main branch of plone.restapi and update submodules
2 parents 742ae7c + b5f7930 commit 9fe1ba3

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/update_submodule.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
# Checkout
1111
- uses: actions/checkout@v3
12-
with:
12+
with:
1313
ref: 6.0
1414
submodules: true
1515

@@ -26,5 +26,5 @@ jobs:
2626
git status
2727
git config user.name github-actions
2828
git config user.email [email protected]
29-
git commit -m "Update submo0dules tip" || echo "No changes to commit"
29+
git commit -m "Update submodules tip" || echo "No changes to commit"
3030
git push

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[submodule "submodules/plone.restapi"]
66
path = submodules/plone.restapi
77
url = https://github.com/plone/plone.restapi.git
8-
branch = master
8+
branch = main
99
[submodule "submodules/plone.api"]
1010
path = submodules/plone.api
1111
url = https://github.com/plone/plone.api.git

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
# Ignore github.com pages with anchors
8989
r"https://github.com/.*#.*",
9090
# Ignore other specific anchors
91-
r"https://coveralls.io/repos/github/plone/plone.restapi/badge.svg\?branch=master", # plone.restapi
91+
r"https://coveralls.io/repos/github/plone/plone.restapi/badge.svg\?branch=main", # plone.restapi
9292
r"https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS/Errors#Identifying_the_issue",
9393
r"https://docs.cypress.io/guides/references/migration-guide#Migrating-to-Cypress-version-10-0", # volto
9494
]

docs/install/manage-add-ons-packages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ Add the Plone package you want to check out in {file}`mx.ini`.
325325
```ini
326326
[plone.restapi]
327327
url = [email protected]:plone/plone.restapi.git
328-
branch = master
328+
branch = main
329329
extras = test
330330
```
331331

0 commit comments

Comments
 (0)