Browse code resolved cherry-pick conflicts dev
1 parent 4fd4482 commit d2ea631b50126d1bcda65bbe954cea042c7ea6e1 Brian Riley authored on 2 Jun 2017

Showing 17 changed files

• app/controllers/registrations_controller.rb
• app/helpers/application_helper.rb
• app/views/devise/passwords/new.html.erb
• app/views/devise/registrations/edit.html.erb
• app/views/home/index.html.erb
• app/views/shared/_accessible_input.html.erb
• app/views/shared/_accessible_submit_button.html.erb
• app/views/shared/_login_form.html.erb
• app/views/shared/_register_form.html.erb
• config/application.rb
• lib/assets/javascripts/devise/passwords/new.js
• lib/assets/javascripts/devise/registrations/edit.js
• lib/assets/javascripts/roadmap-form.js
• lib/assets/javascripts/shared/login_form.js
• lib/assets/javascripts/shared/register_form.js
• lib/assets/stylesheets/roadmap-form.scss
• lib/assets/stylesheets/roadmap-hacks.scss

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

Ignore Space Show notes View app/helpers/application_helper.rb

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

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

Ignore Space Show notes View app/views/home/index.html.erb

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

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

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

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

Ignore Space Show notes View config/application.rb

Ignore Space Show notes View lib/assets/javascripts/devise/passwords/new.js

Ignore Space Show notes View lib/assets/javascripts/devise/registrations/edit.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/roadmap-form.js

Ignore Space Show notes View lib/assets/javascripts/shared/login_form.js

Ignore Space Show notes View lib/assets/javascripts/shared/register_form.js

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

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

Show line notes below