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.

Sign up for GitHub

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

Jump to bottom

WIP Migrate Fat Free CRM to Rails 7 #1115

Closed
wants to merge 7 commits into from
Closed

WIP Migrate Fat Free CRM to Rails 7 #1115

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ad8e48
upgrade to rails 7
johnbumgardner May 28, 2023
c94780f
try with prepare db
johnbumgardner May 28, 2023
6f4372c
put old prep command back
johnbumgardner May 28, 2023
1f697ca
small mod
johnbumgardner May 28, 2023
34cdb5c
minor tweak
johnbumgardner May 29, 2023
d850b11
try removing namespace to task
johnbumgardner May 29, 2023
2ba2858
Merge branch 'master' into rails-7
CloCkWeRX Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ group :heroku do
gem 'puma'
end

gem 'responds_to_parent', git: 'https://github.com/CloCkWeRX/responds_to_parent.git', branch: 'patch-2' # Temporarily pointed at git until https://github.com/zendesk/responds_to_parent/pull/7 is released
gem 'acts_as_commentable', git: 'https://github.com/fatfreecrm/acts_as_commentable.git', branch: 'rails-61' # Our fork
gem 'responds_to_parent'
Copy link
Member

Choose a reason for hiding this comment

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

Ditto this one. Zendesk appear to be a bit useless at merging.

zendesk/responds_to_parent#7

gem 'acts_as_commentable'
Copy link
Member

Choose a reason for hiding this comment

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

Be aware that the upstream maintainer of this gem went MIA.

jackdempsey/acts_as_commentable@master...fatfreecrm:acts_as_commentable:rails-61

I'd recommend forking from our version and making a rails-7 branch

gem 'sassc-rails'
gem 'coffee-rails'
gem 'uglifier'
Expand Down
Loading