Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(v1.6.0): protect individual certificate endpoint with token #251

Merged
merged 5 commits into from
Sep 2, 2024

Conversation

github-actions[bot]
Copy link

Automated PR to merge changes from develop to release-v1.6.0

I failed to cherry-pick the changes automatically because of the following:

Auto-merging src/index.ts
[auto-pr-release-v1.6.0-250-9957 7c321093] chore: protect individual certificate endpoint with token
Author: Md. Ashikul Alam <[email protected]>
Date: Thu Aug 22 16:53:42 2024 +0600
1 file changed, 1 deletion(-)
Auto-merging src/index.ts
[auto-pr-release-v1.6.0-250-9957 959dff27] chore: add event cert route in production
Author: Md. Ashikul Alam <[email protected]>
Date: Thu Aug 22 17:18:27 2024 +0600
1 file changed, 9 insertions(+), 11 deletions(-)
Auto-merging src/index.ts
[auto-pr-release-v1.6.0-250-9957 ce1e70a3] chore: clean up redundant certificate route
Author: Md. Ashikul Alam <[email protected]>
Date: Thu Aug 22 17:22:17 2024 +0600
2 files changed, 4 insertions(+), 42 deletions(-)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply 6c0645bf... docs: update changelog(7464)

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-250-9957:auto-pr-release-v1.6.0-250-9957
git fetch origin ocrvs-7464-country:ocrvs-7464-country

git checkout auto-pr-release-v1.6.0-250-9957
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick d7e00ef5 43019f88 1413636b 6c0645bf ada7c65b

@Nil20 Nil20 force-pushed the auto-pr-release-v1.6.0-250-9957 branch from 9286a0e to fb2a589 Compare August 29, 2024 07:08
@Zangetsu101 Zangetsu101 merged commit b0d02ef into release-v1.6.0 Sep 2, 2024
1 check passed
@Zangetsu101 Zangetsu101 deleted the auto-pr-release-v1.6.0-250-9957 branch September 2, 2024 06:49
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.

2 participants