Skip to content

Merge release/1.15@1.15.1#15414

Merged
straight-shoota merged 11 commits intomasterfrom
release/1.15
Feb 6, 2025
Merged

Merge release/1.15@1.15.1#15414
straight-shoota merged 11 commits intomasterfrom
release/1.15

Conversation

@straight-shoota
Copy link
Member

No description provided.

straight-shoota and others added 11 commits January 17, 2025 10:07
Co-authored-by: Julien Portalier <julien@portalier.com>
The abstract method refers to the non existing `Index` type. Weirdly the compiler won't complain until someone defines an `Index` type.

Resolves #15357

(cherry picked from commit 5a245d9)

Co-authored-by: Johannes Müller <straightshoota@gmail.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 659cf25)

Co-authored-by: Johannes Müller <straightshoota@gmail.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
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.
@ysbaddaden
Copy link
Collaborator

There are conflicts to solve.

@straight-shoota
Copy link
Member Author

straight-shoota commented Feb 6, 2025

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 master into release/1.15). So we need to fix them in the merge commit.

I suppose an alternative would be to split a merge branch off master, merge release/1.15 into that (resolving the conflicts at that time) and then make a PR for the merge branch which would be a fast-forward from master. 🤔 => #15422

@straight-shoota straight-shoota merged commit 89aa014 into master Feb 6, 2025
140 checks passed
straight-shoota added a commit to crystal-lang/distribution-scripts that referenced this pull request Mar 13, 2025
@straight-shoota straight-shoota modified the milestone: 1.16.0 Mar 25, 2025
@straight-shoota straight-shoota modified the milestone: 1.16.0 Apr 28, 2025
@straight-shoota straight-shoota added this to the 1.16.0 milestone Oct 14, 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.

3 participants