Merge branch 'develop' into rep_quality

.gitignore

@@ -7,6 +7,7 @@
 /config/configuration.yml
 /config/additional_environment.rb
 /config/oneapm.yml
+/config/environments/production.rb
 
 
 /files/*

app/models/at_message.rb

@@ -99,7 +99,7 @@ class AtMessage < ActiveRecord::Base
         else
           type = "journal_for_message"
           detail_id = topic.id
-          detail_title = at_message.notes
+          detail_title = topic.notes.nil? ? "" : topic.notes
         end
       else
         status = -1

lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb

@@ -219,11 +219,7 @@ module Redmine
 
               if a && !attachment['is_public_checkbox']
                 # 考虑到更新操作，所以全部设置为公开，私有项目、课程是不能访问的
-                if is_public
+                a.is_public = true
-                  a.is_public = true
-                else
-                  a.is_public = false
-                end
               elsif a && attachment['is_public_checkbox']
                 a.is_public = true
               end