Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP
dev
commit 6d343853226dc71476b305de3b8d4251dfd7269e
2 parents b4757a6 + 56d9b88
@briley briley authored on 14 Jun 2017
Showing 9 changed files
View
app/controllers/registrations_controller.rb
View
app/models/user.rb
View
app/views/devise/registrations/_password_details.html.erb 0 → 100644
View
app/views/devise/registrations/_personal_details.html.erb 0 → 100644
View
app/views/devise/registrations/edit.html.erb
View
app/views/users/_notification_preferences.html.erb 0 → 100644
View
db/migrate/20170606215136_add_preferences_to_users.rb 0 → 100644
View
lib/assets/stylesheets/roadmap-tabs.scss
View
lib/assets/stylesheets/roadmap.scss