Sync our fork#4
Merged
langalex merged 9 commits intocobot:masterfrom Jan 10, 2025
Merged
Conversation
wetterkrank
commented
Jan 10, 2025
wetterkrank
commented
- Pull the latest parent changes to our fork
* remove sassc/sprockets dependencies. add propshaft + css/js-bundling-rails instead * add puma for system tests * remove jquery-rails * add built assets to git * make jquery available globally for now * add propshaft to all gemfiles, update rails versions to fix security warnings * use sprockets for 6.1 - propshaft needs rails 7 * enable file_upload * add flatpickr package * fix burger menu * move redactor imports to wysywyg.js * remove compiled assets from git. compile on gem build instead. Downside: the gem cannot be used directly from git (referenced in Gemfile via github/git/path) since assets are missing.
* Rails 8 compatibility, Ruby 3.4.1 compatibility - Rails 8 now supported - Rails 6 no longer supported --------- Co-authored-by: Judah Meek <judah.meek@gmail.com>
Fix release links in CHANGELOG
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.