Merge release/1.15@1.15.1
#15414
Merged
Merge release/1.15@1.15.1
#15414
+91
−14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Julien Portalier <julien@portalier.com>
(cherry picked from commit 2b544f1) Co-authored-by: Billy.Zheng <vil963@gmail.com>
The gc_none interface doesn't define the `sig_suspend` nor `sig_resume` class methods. The program should still compile but commit 57017f6 improperly checks for the method existence, and the methods are always required and compilation fails. (cherry picked from commit 0fbdcc9) Co-authored-by: Julien Portalier <julien@portalier.com>
(cherry picked from commit 2697a0f)
Updates `distribution-scripts` dependency to crystal-lang/distribution-scripts@1ee31a4 This includes the following changes: * crystal-lang/distribution-scripts#350
This is to detect issues like crystal-lang/distribution-scripts#330 directly in the build process.
With `directory_listing: false` the handler returns 404 Not Found when requesting a directory with the trailing slash (`/foo/`). But, if the trailing slash is missing (`/foo`), it redirects to `/foo/` with a 302 Found response. This leaks information about the existence of directories and can lead to redirect loops if a reverse proxy tries to remove trailing slashes. Co-authored-by: Julien Portalier <julien@portalier.com>
Adds support for the automated backport workflow added in #15372.
25 tasks
|
There are conflicts to solve. |
|
Yeah but we want to merge this with a merge commit to join the two histories in git. And I don't think it's possible to resolve the conflicts ahead of time without altering the base branch (and we don't want to merge I suppose an alternative would be to split a merge branch off |
straight-shoota
added a commit
to crystal-lang/distribution-scripts
that referenced
this pull request
Mar 13, 2025
Documens the process of crystal-lang/crystal#15422, described in crystal-lang/crystal#15414 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.