Browse code resolving merge conflicts during rebase dev
commit a76e814b178fb98cfe9663a1a6fcf54fa1cb30f5 2 parents fbcba9a + 434a945 briley authored on 26 Oct 2016

Showing 21 changed files

• Gemfile
• Gemfile.lock
• README.md
• app/controllers/projects_controller.rb
• app/controllers/token_permission_types_controller.rb
• app/controllers/users_controller.rb
• app/models/organisation.rb
• app/models/user.rb
• app/views/devise/registrations/edit.html.erb
• app/views/plans/_answer_form.html.erb
• app/views/plans/_comments.html.erb
• app/views/shared/_register_form.html.erb
• app/views/token_permission_types/index.html.erb
• config/initializers/devise.rb
• config/initializers/devise.rb.example
• config/initializers/devise_example.rb
• config/initializers/recaptcha.rb.example
• config/initializers/recaptcha_example.rb
• db/migrate/20161021100420_single_organisation_for_users.rb
• db/schema.rb
• lib/tasks/migrate.rake

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

Ignore Space Show notes View README.md

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View config/initializers/devise.rb 0 → 100644

Ignore Space Show notes View config/initializers/devise.rb.example 0 → 100644

Show notes View config/initializers/devise_example.rb 100644 → 0

Ignore Space Show notes View config/initializers/recaptcha.rb.example 0 → 100644

Show notes View config/initializers/recaptcha_example.rb 100644 → 0

Ignore Space Show notes View db/migrate/20161021100420_single_organisation_for_users.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View lib/tasks/migrate.rake 0 → 100644

Show line notes below