Skip to content

Docs on traffic breakdown in monthly reports#990

Merged
joehoyle merged 14 commits intomasterfrom
docs-traffic-breakdown
Sep 10, 2025
Merged

Docs on traffic breakdown in monthly reports#990
joehoyle merged 14 commits intomasterfrom
docs-traffic-breakdown

Conversation

@joehoyle
Copy link
Member

No description provided.

joehoyle and others added 13 commits February 17, 2025 18:55
Taken from our list of modules on PHP 8.1
[Backport v23-branch] Updating page-caching.md to include the new query params in exclusion list
Updates the requirements on [humanmade/s3-uploads](https://github.com/humanmade/S3-Uploads) to permit the latest version.
- [Release notes](https://github.com/humanmade/S3-Uploads/releases)
- [Changelog](https://github.com/humanmade/S3-Uploads/blob/master/CHANGELOG.md)
- [Commits](humanmade/S3-Uploads@3.0.7...3.0.9)

---
updated-dependencies:
- dependency-name: humanmade/s3-uploads
  dependency-version: 3.0.9
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
…/humanmade/s3-uploads-tw-3.0.9

Update humanmade/s3-uploads requirement from ^3.0.7 to ^3.0.9
[Backport v23-branch] adds a Altis usage page to documentation
[Backport v23-branch] Order PHP information from newest to oldest.
[Backport v23-branch] Update PHP modules
@mikelittle
Copy link
Contributor

@joehoyle This wants to be a PR against master, then add the backport v23-branch label

@joehoyle joehoyle changed the base branch from v23-branch to master July 25, 2025 14:14
@joehoyle joehoyle merged commit acd9d9e into master Sep 10, 2025
2 of 3 checks passed
@joehoyle joehoyle deleted the docs-traffic-breakdown branch September 10, 2025 12:19
@hm-backport
Copy link

hm-backport bot commented Sep 10, 2025

The backport to v23-branch failed:

Commits ["8a726e5e6b95cae814a40a29df2bc9049c7e6a6f","c06feb12455743fb11ed80fcc15f788d989d3340","dba10ba1f2686bd2f59041e17195fa1a4f3aba67","ca837aa5d00c12179a1bb0e246fb3bb87aa4743f","284595d1a1b474994deb6377292cdccdd385801f","35644def82c93688908de17cdacb6254aa282326","72da92e2eb8b99796eb6c647f54012c80d60639b","063d899d65b2f25211563e65f8ae42b5c4d695a2","5af5d3169a6a51a313fec942346980b0e78e54e3","ad68822f6fcbdc86d2753d0dc09634a7cd60d962","db98ef5c323f27faf48b54ea77d7afa814a3631c","39d3dde3153c177789c9e11aba1bec3273c4bdc4","ff0ade2e88bb849ccbc8a5cc895ae5952f4fc702","a96c9fd9b26271de206738d6da2364375afbb98d"] could not be cherry-picked on top of v23-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v23-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 8a726e5e6b95cae814a40a29df2bc9049c7e6a6f c06feb12455743fb11ed80fcc15f788d989d3340 dba10ba1f2686bd2f59041e17195fa1a4f3aba67 ca837aa5d00c12179a1bb0e246fb3bb87aa4743f 284595d1a1b474994deb6377292cdccdd385801f 35644def82c93688908de17cdacb6254aa282326 72da92e2eb8b99796eb6c647f54012c80d60639b 063d899d65b2f25211563e65f8ae42b5c4d695a2 5af5d3169a6a51a313fec942346980b0e78e54e3 ad68822f6fcbdc86d2753d0dc09634a7cd60d962 db98ef5c323f27faf48b54ea77d7afa814a3631c 39d3dde3153c177789c9e11aba1bec3273c4bdc4 ff0ade2e88bb849ccbc8a5cc895ae5952f4fc702 a96c9fd9b26271de206738d6da2364375afbb98d
# Create a new branch with these backported commits.
git checkout -b backport-990-to-v23-branch
# Push it to GitHub.
git push --set-upstream origin backport-990-to-v23-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v23-branch and the compare/head branch is backport-990-to-v23-branch.

@hm-backport
Copy link

hm-backport bot commented Sep 10, 2025

The backport to v24-branch failed:

Commits ["8a726e5e6b95cae814a40a29df2bc9049c7e6a6f","c06feb12455743fb11ed80fcc15f788d989d3340","dba10ba1f2686bd2f59041e17195fa1a4f3aba67","ca837aa5d00c12179a1bb0e246fb3bb87aa4743f","284595d1a1b474994deb6377292cdccdd385801f","35644def82c93688908de17cdacb6254aa282326","72da92e2eb8b99796eb6c647f54012c80d60639b","063d899d65b2f25211563e65f8ae42b5c4d695a2","5af5d3169a6a51a313fec942346980b0e78e54e3","ad68822f6fcbdc86d2753d0dc09634a7cd60d962","db98ef5c323f27faf48b54ea77d7afa814a3631c","39d3dde3153c177789c9e11aba1bec3273c4bdc4","ff0ade2e88bb849ccbc8a5cc895ae5952f4fc702","a96c9fd9b26271de206738d6da2364375afbb98d"] could not be cherry-picked on top of v24-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v24-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 8a726e5e6b95cae814a40a29df2bc9049c7e6a6f c06feb12455743fb11ed80fcc15f788d989d3340 dba10ba1f2686bd2f59041e17195fa1a4f3aba67 ca837aa5d00c12179a1bb0e246fb3bb87aa4743f 284595d1a1b474994deb6377292cdccdd385801f 35644def82c93688908de17cdacb6254aa282326 72da92e2eb8b99796eb6c647f54012c80d60639b 063d899d65b2f25211563e65f8ae42b5c4d695a2 5af5d3169a6a51a313fec942346980b0e78e54e3 ad68822f6fcbdc86d2753d0dc09634a7cd60d962 db98ef5c323f27faf48b54ea77d7afa814a3631c 39d3dde3153c177789c9e11aba1bec3273c4bdc4 ff0ade2e88bb849ccbc8a5cc895ae5952f4fc702 a96c9fd9b26271de206738d6da2364375afbb98d
# Create a new branch with these backported commits.
git checkout -b backport-990-to-v24-branch
# Push it to GitHub.
git push --set-upstream origin backport-990-to-v24-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v24-branch and the compare/head branch is backport-990-to-v24-branch.

mikelittle added a commit that referenced this pull request Sep 12, 2025
Backport #990 to v24 branch.
mikelittle added a commit that referenced this pull request Sep 12, 2025
Backport #990 to v23 branch.
mikelittle added a commit that referenced this pull request Sep 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants