From dd825a6426e89526273484c801361d447571b11e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sun, 18 Sep 2016 16:26:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?config/environments/production.rb=20=20?=
 =?UTF-8?q?=E8=BF=99=E4=B8=AA=E6=96=87=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=88=B0?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index a1f5f7e76..9d33b264c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 /config/configuration.yml
 /config/additional_environment.rb
 /config/oneapm.yml
+/config/environments/production.rb
 
 
 /files/*

From fe431902d70cce85acee1fb1df9a9f2305d46e17 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Sun, 18 Sep 2016 16:48:20 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E7=9A=84at=E5=BE=AE=E4=BF=A1=E7=9B=B8=E5=85=B3BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/at_message.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/at_message.rb b/app/models/at_message.rb
index 2212ef07e..10afe3e79 100644
--- a/app/models/at_message.rb
+++ b/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

From 030056fd0d0a17792446f9d89375abbef0be88db Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 18 Sep 2016 16:51:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=E9=99=84=E4=BB=B6=E4=B8=8B=E8=BD=BD=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
index 20bc0a7ad..acfc28c41 100644
--- a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
+++ b/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
-                else
-                  a.is_public = false
-                end
+                a.is_public = true
               elsif a && attachment['is_public_checkbox']
                 a.is_public = true
               end