upgrade ruby version
Merge branch 'master' of github.com:patrickf3139/bCal-Website
upgrade ruby version
Merge branch 'master' of github.com:patrickf3139/bCal-Website
Merge branch 'master' of github.com:patrickf3139/bCal-Website
Merge branch 'auth' of https://github.com/patrickf3139/bCal-Website
All my work so far on auth stuff
Merge branch 'auth' of https://github.com/patrickf3139/bCal-Website into auth
Maybe working stuff??
Merge branch 'auth' of https://github.com/patrickf3139/bCal-Website into auth
add some test stuff for roles
Worked more on index
Update schema
Merged
Filtering works
Made filtering work better
added user edit
Authorization should work
Merged
passing tests