search

tricknotes / ember-cli-rails

Unify your EmberCLI and Rails Workflows
http://thoughtbot.github.io/ember-cli-rails/
MIT License
713 stars 205 forks source link

Upgrade cocaine dependency to terrapin #561

Closed f1sherman closed 6 years ago

f1sherman commented 6 years ago

https://github.com/thoughtbot/cocaine#cocaine-has-been-renamed-to-terrapin

seanpdoyle commented 6 years ago

@f1sherman I tried to resolve the conflicts through GitHub's UI, but botched it.

Could you change the gemspec and re-push?

   spec.add_dependency "ember-cli-rails-assets", "~> 0.6.2"
-  spec.add_dependency "railties", ">= 3.2"
   spec.add_dependency "railties", ">= 4.2"
f1sherman commented 6 years ago

@seanpdoyle sure thing, should be all set now!

seanpdoyle commented 6 years ago

Merged as part of https://github.com/thoughtbot/ember-cli-rails/commit/eb0c154fb3a42b8a86accc5b52842e54c8053254.

Thanks!