Browse code fixed merge conflict left over from unstashed changes dev
commit aafba6976bd691354e81891a93819f8912a825b4 2 parents 543c4f4 + 56d9b88 Brian Riley authored on 15 Jun 2017

Showing 15 changed files

• app/controllers/registrations_controller.rb
• app/models/user.rb
• app/views/devise/registrations/_password_details.html.erb
• app/views/devise/registrations/_personal_details.html.erb
• app/views/devise/registrations/edit.html.erb
• app/views/orgs/_shibboleth_ds_list.html.erb
• app/views/orgs/shibboleth_ds.html.erb
• app/views/plans/_available_templates.html.erb
• app/views/plans/new.html.erb
• app/views/shared/_login_form.html.erb
• app/views/users/_notification_preferences.html.erb
• db/migrate/20170606215136_add_preferences_to_users.rb
• lib/assets/stylesheets/roadmap-form.scss
• lib/assets/stylesheets/roadmap-tabs.scss
• lib/assets/stylesheets/roadmap.scss

Ignore Space Show notes View app/controllers/registrations_controller.rb

Ignore Space Show notes View app/models/user.rb

Ignore Space Show notes View app/views/devise/registrations/_password_details.html.erb 0 → 100644

Ignore Space Show notes View app/views/devise/registrations/_personal_details.html.erb 0 → 100644

Ignore Space Show notes View app/views/devise/registrations/edit.html.erb

Ignore Space Show notes View app/views/orgs/_shibboleth_ds_list.html.erb

Ignore Space Show notes View app/views/orgs/shibboleth_ds.html.erb

Ignore Space Show notes View app/views/plans/_available_templates.html.erb

Ignore Space Show notes View app/views/plans/new.html.erb

Ignore Space Show notes View app/views/shared/_login_form.html.erb

Ignore Space Show notes View app/views/users/_notification_preferences.html.erb 0 → 100644

Ignore Space Show notes View db/migrate/20170606215136_add_preferences_to_users.rb 0 → 100644

Ignore Space Show notes View lib/assets/stylesheets/roadmap-form.scss

Ignore Space Show notes View lib/assets/stylesheets/roadmap-tabs.scss

Ignore Space Show notes View lib/assets/stylesheets/roadmap.scss

Show line notes below