search

kandanapp / kandan

Kandan is an Open Source Alternative to HipChat
GNU Affero General Public License v3.0
2.72k stars 408 forks source link

Switch to CanCanCan #409

Closed bodrovis closed 9 years ago

bodrovis commented 9 years ago

https://github.com/ryanb/cancan project is pretty much dead so the new https://github.com/CanCanCommunity/cancancan takes its place. The tests are passing (apart from those mentioned here https://github.com/kandanapp/kandan/pull/408#issue-50843151

bodrovis commented 9 years ago

@scouttyg Merge conflicts resolved

scouttyg commented 9 years ago

Lets squash this into a single commit -- no need for 5 commits with only 6 line changes in total :)

jrgifford commented 9 years ago

:+1:

bodrovis commented 9 years ago

I will open a new PR because rebasing returns errors (seems like because of merging rspec3 branch that still using cancan).