locomotivecms / engine

A platform to create, publish and edit sites
http://www.locomotivecms.com
Other
2.32k stars 625 forks source link

Rails 7 #1408

Closed did closed 3 months ago

boie0025 commented 5 months ago

:shipit: 👏

dahogenelst commented 4 months ago

Hi @did

I've added a PR https://github.com/locomotivecms/engine/pull/1412 which is (maybe) partly covered by this PR, while rails 7 already is something that is present in master.

Is that why conflicts are detected? Wat is the state of this PR? Can It be removed, maybe? Also, could you give a look into my PR?