search

adopted-ember-addons / ember-cli-flash

Simple, highly configurable flash messages for ember-cli
https://www.npmjs.com/package/ember-cli-flash
MIT License
355 stars 113 forks source link

Avoid deprecation warning about Ember.merge #288

Closed olleolleolle closed 5 years ago

olleolleolle commented 5 years ago

This PR avoids deprecation warnings about Ember.merge by swapping order in the ||.

Inspired by https://github.com/simplabs/ember-simple-auth/pull/941/files

Thanks for building this thing!

sbatson5 commented 5 years ago

Thanks for catching this!

josemarluedke commented 5 years ago

@sbatson5 @Dhaulagiri Can we get a new release containing this change? Thanks.

Dhaulagiri commented 5 years ago

Released in 1.7.1

olleolleolle commented 5 years ago

Thanks!