Merge pull request #6959 from cmrd-senya/devise-upgrade

Gemfile

Gemfile.lock

config/locales/devise/devise.en.yml

spec/controllers/admin/pods_controller_spec.rb

spec/controllers/admin/users_controller_spec.rb

spec/controllers/admins_controller_spec.rb

...lers/api/openid_connect/authorizations_controller_spec.rb

.../controllers/api/openid_connect/user_applications_spec.rb

spec/controllers/aspect_memberships_controller_spec.rb

spec/controllers/aspects_controller_spec.rb

spec/controllers/comments_controller_spec.rb

spec/controllers/contacts_controller_spec.rb

.../controllers/conversation_visibilities_controller_spec.rb

spec/controllers/conversations_controller_spec.rb

spec/controllers/invitations_controller_spec.rb

spec/controllers/jasmine_fixtures/admins_spec.rb

spec/controllers/jasmine_fixtures/aspects_spec.rb

spec/controllers/jasmine_fixtures/contacts_spec.rb

spec/controllers/jasmine_fixtures/conversations_spec.rb

spec/controllers/jasmine_fixtures/notifications_spec.rb