add SocialMediaSites, move updating of any non password user attributes to run thru users_controller and not devise
add SocialMediaSites, move updating of any non password user attribut…
…es to run thru users_controller and not devise
avoid branch conflicts
finish SocialMediaSitesController (edit, update, destroy), remove accepts_nested_attributes_for since it will get clunky/anti-pattern, modify UsersController tests
remove biographies_controllers_spec since no longer needed, implemented spring for rails preloading, set up binstubs
Merge branch 'social_media_sites' into develop
tracks
-tracks model link, name and user_id foreign key
-tracks will belong to a user
-normal crud tracks_controller
-change social_media_controller put#update to patch#update to follow new convention
add Event
-custom validation to check that events submitted are in the future
add video
add Blog
remove extraneous view files
DRY up model specs
- move specs that check factory validity to spec/factories_spec.rb
create forms for new blogs, events, social media, tracks, videos
add forms for creating blogs, tracks, videos, social media sites, events
implement authorization: add admin attribute to users, add cacancan authorization
Merge pull request #9 from thwang/develop

grouping unmerged commits for review in dev branch