Changeset [09556f1e689f5a13597d2e5a96d8e14c904358f2] by Johnny Shields

February 10th, 2018 @ 02:54 AM

Merge remote-tracking branch 'remotes/DmitryAvramec/devise-final' into devise-final

Conflicts:

Gemfile.lock

https://github.com/fatfreecrm/fat_free_crm/commit/09556f1e689f5a135...

Committed by Johnny Shields

  • M ".rubocop_todo.yml"
  • M Gemfile.lock
  • M app/controllers/admin/field_groups_controller.rb
  • M app/controllers/admin/fields_controller.rb
  • M app/controllers/admin/groups_controller.rb
  • M app/controllers/admin/tags_controller.rb
  • M app/controllers/application_controller.rb
  • M app/controllers/comments_controller.rb
  • M app/controllers/entities/opportunities_controller.rb
  • M app/controllers/entities_controller.rb
  • M app/controllers/lists_controller.rb
  • M app/controllers/tasks_controller.rb
  • M app/helpers/accounts_helper.rb
  • M app/helpers/leads_helper.rb
  • M app/helpers/opportunities_helper.rb
  • M app/models/entities/opportunity.rb
  • M app/models/observers/opportunity_observer.rb
  • M app/models/users/user.rb
  • M app/views/campaigns/_metrics.html.haml
  • M app/views/devise/sessions/new.html.haml
  • M app/views/home/_opportunity.html.haml
  • M app/views/opportunities/_index_long.html.haml
  • M app/views/opportunities/_sidebar_show.html.haml
  • M app/views/opportunities/_top_section.html.haml
  • M spec/features/devise/sign_in_spec.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

Ruby on Rails CRM platform for Web 2.0 and beyond