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

R 3.1.3 #3467

Merged
merged 8 commits into from Mar 29, 2024
Merged

R 3.1.3 #3467

merged 8 commits into from Mar 29, 2024

Conversation

HazelGrant
Copy link
Contributor

No description provided.

apps/myjobs/Gemfile Outdated Show resolved Hide resolved
@HazelGrant HazelGrant force-pushed the r_3.1.3 branch 3 times, most recently from 369ddca to 97502ec Compare March 27, 2024 16:01
johrstrom and others added 6 commits March 28, 2024 12:56
This works to re-enable ActionController::Live. It replaces zip_tricks
which is now deprecated with zip_kit which is the replacement.

It also fixes the issue with streaming zip files so ActionController::Live
can be used in the downloading of zip files.
Bumps [rdoc](https://github.com/ruby/rdoc) from 6.3.3 to 6.3.4.1.
- [Release notes](https://github.com/ruby/rdoc/releases)
- [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc)
- [Commits](ruby/rdoc@v6.3.3...v6.3.4.1)

---
updated-dependencies:
- dependency-name: rdoc
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1.
- [Release notes](https://github.com/ruby/rdoc/releases)
- [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc)
- [Commits](ruby/rdoc@v6.6.2...v6.6.3.1)

---
updated-dependencies:
- dependency-name: rdoc
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Copy link
Contributor

@johrstrom johrstrom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it'll work, but I think we're missing #3460 which you can add here or make a new pull request to back port it.

@johrstrom
Copy link
Contributor

We need #3412 backported as well.

@HazelGrant HazelGrant merged commit bf3d784 into release_3.1 Mar 29, 2024
23 checks passed
@HazelGrant HazelGrant deleted the r_3.1.3 branch March 29, 2024 15:08
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.

None yet

5 participants