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

Sync our fork #4

Merged
merged 9 commits into from
Jan 10, 2025
Merged

Sync our fork #4

merged 9 commits into from
Jan 10, 2025

Conversation

wetterkrank
Copy link

  • Pull the latest parent changes to our fork

langalex and others added 9 commits December 30, 2024 18:14
* 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 <[email protected]>
Fix release links in CHANGELOG
@langalex langalex merged commit 5c0ee88 into cobot:master Jan 10, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants