merging with master

app/models/learning_object.rb

@@ -48,10 +48,9 @@ class LearningObject < ApplicationRecord
   # *current_user* destroy learning object
   include Trackable
 
-
   has_paper_trail
 
-  has_many :collection_items, as: :collectionable
+  has_many :collection_items, as: :collectionable, dependent: :destroy
   has_many :collections, through: :collection_items
   has_many :attachments, class_name: 'LearningObject::Attachment', autosave: true # autosave to allow import
 

config/initializers/devise.rb

@@ -12,7 +12,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'suporte@c3sl.ufpr.br'
+  config.mailer_sender = 'portalmec_tec@c3sl.ufpr.br'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'