haml / haml-rails

let your Gemfile do the talking
MIT License
1.04k stars 169 forks source link

allow Rails 6 #147

Closed fauxparse closed 5 years ago

fauxparse commented 5 years ago

SourceAnnotationExtractor was moved under ::Rails in 0ec23effa74e8e9da6ebb14afbd335bea470ab3e.

This change looks for the constant in the correct location depending on the Rails version.

radar commented 5 years ago

Thanks very much @fauxparse. I've expanded on this PR over here: https://github.com/fauxparse/haml-rails/pull/1. I think these changes will make haml-rails work correctly with Rails 6.

radar commented 5 years ago

Tests appear to be breaking here because Travis has a different Bundler version.

indirect commented 5 years ago

you might want to merge in there following PR to get a green build?

@radar I added you to this repo so you can merge this when green

fauxparse commented 5 years ago

@indirect Thanks, I'll keep an eye on it -- at the moment CI is still failing on that branch but I'm kind of swamped at work for now anyway.

syguer commented 5 years ago

Thanks @fauxparse ! This PR looks duplicated with #146 These look same change, so I think #146 should be merged because it opened earlier.

UPDATE: Already some commits are added by @radar, so this PR might be main PR for fix the problem...

radar commented 5 years ago

I think this is good to merge. I will wait for all the tests to finish running first.

radar commented 5 years ago

This was merged in as a part of https://github.com/indirect/haml-rails/pull/150. Thank you!