From 1db5064486218ecfd6295b02312aa761b1144a6d Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Sat, 8 Oct 2016 17:37:41 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/pull_requests/_new.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/pull_requests/_new.html.erb b/app/views/pull_requests/_new.html.erb
index 08e723e6d..8a376d995 100644
--- a/app/views/pull_requests/_new.html.erb
+++ b/app/views/pull_requests/_new.html.erb
@@ -10,7 +10,7 @@
 </div>
 
 <script>
-    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
+    $("#pull_request_new_form").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 
     $("#changed-files").toggle(function(){
         $("#changed-files-detail").show();

From 12d70c69995219613c253b6c9e48ca60ff599465 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 8 Oct 2016 18:06:09 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=E2=80=9C=E5=9F=BA=E4=BA=8E=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=AE=9E=E6=96=BD=E2=80=9D=E7=9A=84=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8D=E8=B5=B7=E4=BD=9C=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       | 4 ++--
 app/controllers/homework_common_controller.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index cbeade2a3..416ef3b98 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,10 +50,10 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 #rails 3.2.22.2 bug
- gem "test-unit", "~>3.0"
+ #gem "test-unit", "~>3.0"
 
 ### profile
- gem 'oneapm_rpm'
+ #gem 'oneapm_rpm'
 
 group :development do
   gem 'grape-swagger'
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 4511e5a1f..c82c1f947 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -146,7 +146,7 @@ class HomeworkCommonController < ApplicationController
         @homework_detail_group = @homework.homework_detail_group
         @homework_detail_group.min_num = params[:min_num].to_i if params[:min_num]
         @homework_detail_group.max_num = params[:max_num].to_i if params[:max_num]
-        @homework_detail_group.base_on_project = params[:base_on_project].to_i if params[:base_on_project]
+        @homework_detail_group.base_on_project = params[:base_on_project] ? 1 : 0
       end
 
       @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment].to_i : 1

From 56de0cc0be804c7191b756e2c6037ce1415a8b22 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 8 Oct 2016 18:06:33 +0800
Subject: [PATCH 03/10] =?UTF-8?q?gemfile=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 416ef3b98..cbeade2a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,10 +50,10 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 #rails 3.2.22.2 bug
- #gem "test-unit", "~>3.0"
+ gem "test-unit", "~>3.0"
 
 ### profile
- #gem 'oneapm_rpm'
+ gem 'oneapm_rpm'
 
 group :development do
   gem 'grape-swagger'

From 7a72e7e839db48b0e8e72605b4d7c408ff890af4 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 8 Oct 2016 19:07:52 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E7=9A=84=E9=99=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/syllabuses/show.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb
index b6c32f125..7e5af4ec0 100644
--- a/app/views/syllabuses/show.html.erb
+++ b/app/views/syllabuses/show.html.erb
@@ -38,9 +38,9 @@
       <div class="sy_tab_con">
         <div class="syllabuscon upload_img" id="syllabus_description_<%= @syllabus.id %>">
           <%=@syllabus.description.html_safe %>
-          <div class="mt10" style="font-weight:normal;">
-            <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @syllabus} %>
-          </div>
+        </div>
+        <div class="mt10" style="font-weight:normal; font-size: 12px;">
+          <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @syllabus} %>
         </div>
         <% if User.current.logged? && User.current == @syllabus.user%>
             <div class="homepagePostSetting" style="margin:10px;">

From f0e334d33d85e097cadb80db65f781a255ab67c3 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sun, 9 Oct 2016 09:16:05 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E8=BF=9F=E4=BA=A4=E6=89=A3=E5=88=86=E5=92=8C=E7=BC=BA?=
 =?UTF-8?q?=E8=AF=84=E6=89=A3=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 25 ++++++++++++++++---
 app/models/student_work.rb                    |  2 +-
 .../_evaluation_un_group_work.html.erb        |  6 ++---
 lib/tasks/homework_evaluation.rake            | 24 +++++++++++++++---
 4 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index c82c1f947..75e8df200 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -255,11 +255,28 @@ class HomeworkCommonController < ApplicationController
     @homework_detail_manual.update_column('evaluation_end', Date.today)
     #计算缺评扣分
     work_ids = "(" + @homework.student_works.has_committed.map(&:id).join(",") + ")"
-    @homework.student_works.has_committed.each do |student_work|
-      absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
-      student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
-      student_work.save
+    if @homework.homework_type != 3
+      @homework.student_works.has_committed.each do |student_work|
+        absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
+        student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
+        student_work.save
+      end
+    else
+      @homework.student_works.has_committed.each do |student_work|
+        absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
+        student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
+        student_work.save
+        if student_work.absence_penalty != 0
+          pros = student_work.student_work_projects.where("is_leader = 0")
+          user_ids = pros.empty? ? "(-1)" : "(" + pros.map{|stu|stu.user_id}.join(",") + ")"
+          student_works = @homework.student_works.where("user_id in #{user_ids}")
+          student_works.each do |st_work|
+            st_work.update_attribute("absence_penalty", student_work.absence_penalty)
+          end
+        end
+      end
     end
+
     # 匿评关闭消息邮件通知
     send_message_anonymous_comment(@homework, m_status = 3)
     Mailer.send_mail_anonymous_comment_close(@homework).deliver
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index a3f692341..a33200b3b 100644
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@@ -1,6 +1,6 @@
 #学生提交作品表 #work_status :0 未提交  1 已提交  2 迟交  3 分组作品复制的组员作品
 class StudentWork < ActiveRecord::Base
-  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :system_score, :work_score, :project_id, :is_test, :simi_id, :simi_value, :work_status, :commit_time
+  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :system_score, :work_score, :project_id, :is_test, :simi_id, :simi_value, :work_status, :commit_time, :late_penalty, :absence_penalty
 
   belongs_to :homework_common
   belongs_to :user
diff --git a/app/views/student_work/_evaluation_un_group_work.html.erb b/app/views/student_work/_evaluation_un_group_work.html.erb
index 8c18d64c7..fb0efd9c8 100644
--- a/app/views/student_work/_evaluation_un_group_work.html.erb
+++ b/app/views/student_work/_evaluation_un_group_work.html.erb
@@ -52,15 +52,15 @@
         <% unless score.nil?%>
             <div class="g_infoNi none width180">
               作品最终评分为
-              <span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。
+              <span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。<br/>
               迟交扣分
                       <span class="c_red">&nbsp;
                         <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.late_penalty %>
-                        &nbsp;</span>分，
+                        &nbsp;</span>分，<br/>
               缺评扣分
                       <span class="c_red">&nbsp;
                         <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.absence_penalty%>
-                        &nbsp;</span>分，
+                        &nbsp;</span>分，<br/>
               最终成绩为
               <span class="c_red">&nbsp;<%= format("%.1f",score<0 ? 0 : score)%>&nbsp;</span>分。
             </div>
diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake
index a8356ea5a..65edcec9f 100644
--- a/lib/tasks/homework_evaluation.rake
+++ b/lib/tasks/homework_evaluation.rake
@@ -77,10 +77,26 @@ namespace :homework_evaluation do
       if homework_common.anonymous_comment == 0 && homework_detail_manual.comment_status == 2 #开启匿评状态才可关闭匿评
         #计算缺评扣分
         work_ids = "(" + homework_common.student_works.has_committed.map(&:id).join(",") + ")"
-        homework_common.student_works.has_committed.each do |student_work|
-          absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
-          student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0
-          student_work.save
+        if homework_common.homework_type != 3
+          homework_common.student_works.has_committed.each do |student_work|
+            absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
+            student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0
+            student_work.save
+          end
+        else
+          homework_common.student_works.has_committed.each do |student_work|
+            absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
+            student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0
+            student_work.save
+            if student_work.absence_penalty != 0
+              pros = student_work.student_work_projects.where("is_leader = 0")
+              user_ids = pros.empty? ? "(-1)" : "(" + pros.map{|stu|stu.user_id}.join(",") + ")"
+              student_works = homework_common.student_works.where("user_id in #{user_ids}")
+              student_works.each do |st_work|
+                st_work.update_attribute("absence_penalty", student_work.absence_penalty)
+              end
+            end
+          end
         end
         homework_detail_manual.update_column('comment_status', 3)
         # 匿评关闭消息通知 给所有人发

From b123192286b3cd7ed682cbcd858e72ee122bff8f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sun, 9 Oct 2016 09:48:55 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E5=8C=BF=E8=AF=84=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 38 +++++++++----------
 app/helpers/application_helper.rb             |  2 +-
 lib/tasks/homework_evaluation.rake            | 38 +++++++++----------
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 75e8df200..9fe29746e 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -202,24 +202,24 @@ class HomeworkCommonController < ApplicationController
     if @homework_detail_manual.comment_status == 1
       student_works = @homework.student_works.has_committed
       if student_works && student_works.size >= 2
-        if @homework.homework_type == 3
-          student_work_projects = @homework.student_work_projects.where("student_work_id is not null")
-          student_work_projects.each_with_index do |pro_work, pro_index|
-            n = @homework_detail_manual.evaluation_num
-            n = n < student_works.size ? n : student_works.size - 1
-            work_index = -1
-            student_works.each_with_index do |stu_work, stu_index|
-              if stu_work.id.to_i == pro_work.student_work_id.to_i
-                work_index = stu_index
-              end
-            end
-            assigned_homeworks = get_assigned_homeworks(student_works, n, work_index)
-            assigned_homeworks.each do |h|
-              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: pro_work.user_id, student_work_id: h.id)
-              student_works_evaluation_distributions.save
-            end
-          end
-        else
+        # if @homework.homework_type == 3
+        #   student_work_projects = @homework.student_work_projects.where("student_work_id is not null")
+        #   student_work_projects.each_with_index do |pro_work, pro_index|
+        #     n = @homework_detail_manual.evaluation_num
+        #     n = n < student_works.size ? n : student_works.size - 1
+        #     work_index = -1
+        #     student_works.each_with_index do |stu_work, stu_index|
+        #       if stu_work.id.to_i == pro_work.student_work_id.to_i
+        #         work_index = stu_index
+        #       end
+        #     end
+        #     assigned_homeworks = get_assigned_homeworks(student_works, n, work_index)
+        #     assigned_homeworks.each do |h|
+        #       student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: pro_work.user_id, student_work_id: h.id)
+        #       student_works_evaluation_distributions.save
+        #     end
+        #   end
+        # else
           student_works.each_with_index do |work, index|
             user = work.user
             n = @homework_detail_manual.evaluation_num
@@ -230,7 +230,7 @@ class HomeworkCommonController < ApplicationController
               student_works_evaluation_distributions.save
             end
           end
-        end
+        #end
         @homework_detail_manual.update_column('comment_status', 2)
         @homework_detail_manual.update_column('evaluation_start', Date.today)
         @statue = 1
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 27e90b356..07f3c30e3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2829,7 +2829,7 @@ module ApplicationHelper
             link_to "补交作品(#{count})",  new_student_work_url_without_domain(homework.id),:class => 'c_red'
           end
         else
-          if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 && StudentWorksEvaluationDistribution.where("student_work_id = #{work.id}").count > 0 #匿评作业，且作业状态不是在开启匿评之前
+          if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 && StudentWorksEvaluationDistribution.where("student_work_id = #{work.id}").count > 0  && work.user_id == User.current.id #匿评作业，且作业状态不是在开启匿评之前
             link_to "作品匿评", student_work_index_url_in_org(homework.id, 2), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
             link_to "查看作品(#{count})",student_work_index_url_in_org(homework.id, 2), :class => 'c_blue', :title => "匿评已结束"
diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake
index 65edcec9f..448137441 100644
--- a/lib/tasks/homework_evaluation.rake
+++ b/lib/tasks/homework_evaluation.rake
@@ -14,24 +14,24 @@ namespace :homework_evaluation do
       if homework_common.anonymous_comment == 0 && homework_detail_manual.comment_status == 1  #新建状态才可开启匿评
         student_works = homework_common.student_works.has_committed
         if student_works && student_works.size >= 2
-          if homework_common.homework_type == 3
-            student_work_projects = homework_common.student_work_projects.where("student_work_id is not null")
-            student_work_projects.each_with_index do |pro_work, pro_index|
-              n = homework_detail_manual.evaluation_num
-              n = n < student_works.size ? n : student_works.size - 1
-              work_index = -1
-              student_works.each_with_index do |stu_work, stu_index|
-                if stu_work.id.to_i == pro_work.student_work_id.to_i
-                  work_index = stu_index
-                end
-              end
-              assigned_homeworks = get_assigned_homeworks(student_works, n, work_index)
-              assigned_homeworks.each do |h|
-                student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: pro_work.user_id, student_work_id: h.id)
-                student_works_evaluation_distributions.save
-              end
-            end
-          else
+          # if homework_common.homework_type == 3
+          #   student_work_projects = homework_common.student_work_projects.where("student_work_id is not null")
+          #   student_work_projects.each_with_index do |pro_work, pro_index|
+          #     n = homework_detail_manual.evaluation_num
+          #     n = n < student_works.size ? n : student_works.size - 1
+          #     work_index = -1
+          #     student_works.each_with_index do |stu_work, stu_index|
+          #       if stu_work.id.to_i == pro_work.student_work_id.to_i
+          #         work_index = stu_index
+          #       end
+          #     end
+          #     assigned_homeworks = get_assigned_homeworks(student_works, n, work_index)
+          #     assigned_homeworks.each do |h|
+          #       student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: pro_work.user_id, student_work_id: h.id)
+          #       student_works_evaluation_distributions.save
+          #     end
+          #   end
+          # else
             student_works.each_with_index do |work, index|
               user = work.user
               n = homework_detail_manual.evaluation_num
@@ -42,7 +42,7 @@ namespace :homework_evaluation do
                 student_works_evaluation_distributions.save
               end
             end
-          end
+          #end
           homework_detail_manual.update_column('comment_status', 2)
           # 匿评开启消息邮件通知，# 所有人
           #send_message_anonymous_comment(homework_common, 2)

From c1e2642a61732d36a9a0690cf5803e7d2db414f3 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sun, 9 Oct 2016 09:56:36 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9A=84=E9=99=84=E4=BB=B6=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E4=BA=BA=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 07f3c30e3..6474a0eae 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2280,6 +2280,8 @@ module ApplicationHelper
         candown = true
       elsif attachment.container.class.to_s=="Memo" #论坛资源允许下载
         candown = true
+      elsif attachment.container.class.to_s=="Syllabus" #论坛资源允许下载
+        candown = true
       elsif attachment.container.class.to_s == "User"
         candown = (attachment.is_public == 1 || attachment.is_public == true || attachment.author_id == User.current.id)
       elsif  attachment.container_type == "Bid" && attachment.container && attachment.container.courses

From 5f1458483ca12ec87bb70962934b0cce045755a1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 9 Oct 2016 13:44:32 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9attachment=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=95=BF=E4=B8=8D=E8=83=BD=E4=B8=8A=E4=BC=A0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/attachment.rb                      |   2 +-
 ...53958_change_description_for_attachment.rb |   9 +
 db/schema.rb                                  | 438 +++++++++++++++++-
 3 files changed, 429 insertions(+), 20 deletions(-)
 create mode 100644 db/migrate/20161009053958_change_description_for_attachment.rb

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 88fadd644..879759c89 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -41,7 +41,7 @@ class Attachment < ActiveRecord::Base
   validates :filename, presence: true, length: {maximum: 254}
   validates :author, presence: true
   validates :disk_filename, length: {maximum: 254}
-  validates :description, length: {maximum: 254}
+  # validates :description, length: {maximum: 254}
   validate :validate_max_file_size
 
   #elasticsearch
diff --git a/db/migrate/20161009053958_change_description_for_attachment.rb b/db/migrate/20161009053958_change_description_for_attachment.rb
new file mode 100644
index 000000000..4ffc71a4f
--- /dev/null
+++ b/db/migrate/20161009053958_change_description_for_attachment.rb
@@ -0,0 +1,9 @@
+class ChangeDescriptionForAttachment < ActiveRecord::Migration
+  def up
+    change_column :attachments, :description, :text
+  end
+
+  def down
+    change_column :attachments, :description, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d8a60c93f..131f50c29 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160921062340) do
+ActiveRecord::Schema.define(:version => 20161009053958) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -52,6 +52,28 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
   add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
   add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
 
+  create_table "application_settings", :force => true do |t|
+    t.integer  "default_projects_limit"
+    t.boolean  "signup_enabled"
+    t.boolean  "signin_enabled"
+    t.boolean  "gravatar_enabled"
+    t.text     "sign_in_text"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "home_page_url"
+    t.integer  "default_branch_protection",    :default => 2
+    t.boolean  "twitter_sharing_enabled",      :default => true
+    t.text     "restricted_visibility_levels"
+    t.boolean  "version_check_enabled",        :default => true
+    t.integer  "max_attachment_size",          :default => 10,    :null => false
+    t.integer  "default_project_visibility"
+    t.integer  "default_snippet_visibility"
+    t.text     "restricted_signup_domains"
+    t.boolean  "user_oauth_applications",      :default => true
+    t.string   "after_sign_out_path"
+    t.integer  "session_expire_delay",         :default => 10080, :null => false
+  end
+
   create_table "applied_messages", :force => true do |t|
     t.integer  "user_id"
     t.integer  "applied_id"
@@ -165,7 +187,7 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.integer  "downloads",                    :default => 0,  :null => false
     t.integer  "author_id",                    :default => 0,  :null => false
     t.datetime "created_on"
-    t.string   "description"
+    t.text     "description"
     t.string   "disk_directory"
     t.integer  "attachtype",                   :default => 1
     t.integer  "is_public",                    :default => 1
@@ -184,6 +206,20 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.string  "typeName", :limit => 50
   end
 
+  create_table "audit_events", :force => true do |t|
+    t.integer  "author_id",   :null => false
+    t.string   "type",        :null => false
+    t.integer  "entity_id",   :null => false
+    t.string   "entity_type", :null => false
+    t.text     "details"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id"
+  add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type"
+  add_index "audit_events", ["type"], :name => "index_audit_events_on_type"
+
   create_table "auth_sources", :force => true do |t|
     t.string  "type",              :limit => 30, :default => "",    :null => false
     t.string  "name",              :limit => 60, :default => "",    :null => false
@@ -281,6 +317,17 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
+  create_table "broadcast_messages", :force => true do |t|
+    t.text     "message",    :null => false
+    t.datetime "starts_at"
+    t.datetime "ends_at"
+    t.integer  "alert_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "color"
+    t.string   "font"
+  end
+
   create_table "bug_to_osps", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "relative_memo_id"
@@ -310,14 +357,16 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
   add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
 
   create_table "changesets", :force => true do |t|
-    t.integer  "repository_id", :null => false
-    t.string   "revision",      :null => false
+    t.integer  "repository_id",                :null => false
+    t.string   "revision",                     :null => false
     t.string   "committer"
-    t.datetime "committed_on",  :null => false
+    t.datetime "committed_on",                 :null => false
     t.text     "comments"
     t.date     "commit_date"
     t.string   "scmid"
     t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "type",          :default => 0
   end
 
   add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
@@ -569,8 +618,8 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.string   "code"
     t.integer  "time"
     t.string   "extra"
-    t.datetime "created_at",                                   :null => false
-    t.datetime "updated_at",                                   :null => false
+    t.datetime "created_at",                                    :null => false
+    t.datetime "updated_at",                                    :null => false
     t.string   "location"
     t.string   "term"
     t.string   "string"
@@ -580,25 +629,26 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.string   "class_period"
     t.integer  "school_id"
     t.text     "description"
-    t.integer  "status",                        :default => 1
-    t.integer  "attachmenttype",                :default => 2
+    t.integer  "status",                         :default => 1
+    t.integer  "attachmenttype",                 :default => 2
     t.integer  "lft"
     t.integer  "rgt"
-    t.integer  "is_public",        :limit => 1, :default => 1
-    t.integer  "inherit_members",  :limit => 1, :default => 1
-    t.integer  "open_student",                  :default => 0
-    t.integer  "outline",                       :default => 0
-    t.integer  "publish_resource",              :default => 0
-    t.integer  "is_delete",                     :default => 0
+    t.integer  "is_public",         :limit => 1, :default => 1
+    t.integer  "inherit_members",   :limit => 1, :default => 1
+    t.integer  "open_student",                   :default => 0
+    t.integer  "outline",                        :default => 0
+    t.integer  "publish_resource",               :default => 0
+    t.integer  "is_delete",                      :default => 0
     t.integer  "end_time"
     t.string   "end_term"
-    t.integer  "is_excellent",                  :default => 0
-    t.integer  "excellent_option",              :default => 0
-    t.integer  "is_copy",                       :default => 0
-    t.integer  "visits",                        :default => 0
+    t.integer  "is_excellent",                   :default => 0
+    t.integer  "excellent_option",               :default => 0
+    t.integer  "is_copy",                        :default => 0
+    t.integer  "visits",                         :default => 0
     t.integer  "syllabus_id"
     t.string   "invite_code"
     t.string   "qrcode"
+    t.integer  "qrcode_expiretime",              :default => 0
   end
 
   add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
@@ -665,6 +715,15 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "deploy_keys_projects", :force => true do |t|
+    t.integer  "deploy_key_id", :null => false
+    t.integer  "project_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id"
+
   create_table "discuss_demos", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -714,6 +773,16 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.datetime "created_at"
   end
 
+  create_table "emails", :force => true do |t|
+    t.integer  "user_id",    :null => false
+    t.string   "email",      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true
+  add_index "emails", ["user_id"], :name => "index_emails_on_user_id"
+
   create_table "enabled_modules", :force => true do |t|
     t.integer "project_id"
     t.string  "name",       :null => false
@@ -736,6 +805,25 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
+  create_table "events", :force => true do |t|
+    t.string   "target_type"
+    t.integer  "target_id"
+    t.string   "title"
+    t.text     "data"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "action"
+    t.integer  "author_id"
+  end
+
+  add_index "events", ["action"], :name => "index_events_on_action"
+  add_index "events", ["author_id"], :name => "index_events_on_author_id"
+  add_index "events", ["created_at"], :name => "index_events_on_created_at"
+  add_index "events", ["project_id"], :name => "index_events_on_project_id"
+  add_index "events", ["target_id"], :name => "index_events_on_target_id"
+  add_index "events", ["target_type"], :name => "index_events_on_target_type"
+
   create_table "exercise_answers", :force => true do |t|
     t.integer  "user_id"
     t.integer  "exercise_question_id"
@@ -838,6 +926,15 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
   add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
   add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
 
+  create_table "forked_project_links", :force => true do |t|
+    t.integer  "forked_to_project_id",   :null => false
+    t.integer  "forked_from_project_id", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true
+
   create_table "forums", :force => true do |t|
     t.string   "name",                        :null => false
     t.text     "description"
@@ -967,6 +1064,21 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "identities", :force => true do |t|
+    t.string   "extern_uid"
+    t.string   "provider"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id"
+  add_index "identities", ["user_id"], :name => "index_identities_on_user_id"
+
+  create_table "innodb_monitor", :id => false, :force => true do |t|
+    t.integer "a"
+  end
+
   create_table "invite_lists", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1113,6 +1225,20 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.integer  "private",                     :default => 0
   end
 
+  create_table "keys", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.text     "key"
+    t.string   "title"
+    t.string   "type"
+    t.string   "fingerprint"
+    t.boolean  "public",      :default => false, :null => false
+  end
+
+  add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id"
+  add_index "keys", ["user_id"], :name => "index_keys_on_user_id"
+
   create_table "kindeditor_assets", :force => true do |t|
     t.string   "asset"
     t.integer  "file_size"
@@ -1124,6 +1250,27 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.integer  "owner_type", :default => 0
   end
 
+  create_table "label_links", :force => true do |t|
+    t.integer  "label_id"
+    t.integer  "target_id"
+    t.string   "target_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id"
+  add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type"
+
+  create_table "labels", :force => true do |t|
+    t.string   "title"
+    t.string   "color"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "labels", ["project_id"], :name => "index_labels_on_project_id"
+
   create_table "member_roles", :force => true do |t|
     t.integer "member_id",                     :null => false
     t.integer "role_id",                       :null => false
@@ -1177,6 +1324,47 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.integer  "viewed_count",  :default => 0
   end
 
+  create_table "merge_request_diffs", :force => true do |t|
+    t.string   "state"
+    t.text     "st_commits",       :limit => 2147483647
+    t.text     "st_diffs",         :limit => 2147483647
+    t.integer  "merge_request_id",                       :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true
+
+  create_table "merge_requests", :force => true do |t|
+    t.string   "target_branch",                    :null => false
+    t.string   "source_branch",                    :null => false
+    t.integer  "source_project_id",                :null => false
+    t.integer  "author_id"
+    t.integer  "assignee_id"
+    t.string   "title"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "milestone_id"
+    t.string   "state"
+    t.string   "merge_status"
+    t.integer  "target_project_id",                :null => false
+    t.integer  "iid"
+    t.text     "description"
+    t.integer  "position",          :default => 0
+    t.datetime "locked_at"
+  end
+
+  add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
+  add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id"
+  add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id"
+  add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at"
+  add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id"
+  add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch"
+  add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id"
+  add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch"
+  add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true
+  add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title"
+
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1211,6 +1399,39 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
   add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
 
+  create_table "milestones", :force => true do |t|
+    t.string   "title",       :null => false
+    t.integer  "project_id",  :null => false
+    t.text     "description"
+    t.date     "due_date"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "state"
+    t.integer  "iid"
+  end
+
+  add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id"
+  add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date"
+  add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true
+  add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
+
+  create_table "namespaces", :force => true do |t|
+    t.string   "name",                        :null => false
+    t.string   "path",                        :null => false
+    t.integer  "owner_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type"
+    t.string   "description", :default => "", :null => false
+    t.string   "avatar"
+  end
+
+  add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id"
+  add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true
+  add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id"
+  add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true
+  add_index "namespaces", ["type"], :name => "index_namespaces_on_type"
+
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",           :limit => 60, :default => "", :null => false
@@ -1236,6 +1457,31 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "notes", :force => true do |t|
+    t.text     "note"
+    t.string   "noteable_type"
+    t.integer  "author_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "project_id"
+    t.string   "attachment"
+    t.string   "line_code"
+    t.string   "commit_id"
+    t.integer  "noteable_id"
+    t.boolean  "system",                              :default => false, :null => false
+    t.text     "st_diff",       :limit => 2147483647
+  end
+
+  add_index "notes", ["author_id"], :name => "index_notes_on_author_id"
+  add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id"
+  add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id"
+  add_index "notes", ["created_at"], :name => "index_notes_on_created_at"
+  add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type"
+  add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type"
+  add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type"
+  add_index "notes", ["project_id"], :name => "index_notes_on_project_id"
+  add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at"
+
   create_table "notificationcomments", :force => true do |t|
     t.string   "notificationcommented_type"
     t.integer  "notificationcommented_id"
@@ -1245,6 +1491,49 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.datetime "updated_at",                 :null => false
   end
 
+  create_table "oauth_access_grants", :force => true do |t|
+    t.integer  "resource_owner_id", :null => false
+    t.integer  "application_id",    :null => false
+    t.string   "token",             :null => false
+    t.integer  "expires_in",        :null => false
+    t.text     "redirect_uri",      :null => false
+    t.datetime "created_at",        :null => false
+    t.datetime "revoked_at"
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true
+
+  create_table "oauth_access_tokens", :force => true do |t|
+    t.integer  "resource_owner_id"
+    t.integer  "application_id"
+    t.string   "token",             :null => false
+    t.string   "refresh_token"
+    t.integer  "expires_in"
+    t.datetime "revoked_at"
+    t.datetime "created_at",        :null => false
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true
+  add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id"
+  add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
+
+  create_table "oauth_applications", :force => true do |t|
+    t.string   "name",                         :null => false
+    t.string   "uid",                          :null => false
+    t.string   "secret",                       :null => false
+    t.text     "redirect_uri",                 :null => false
+    t.string   "scopes",       :default => "", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+  end
+
+  add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type"
+  add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
+
   create_table "onclick_times", :force => true do |t|
     t.integer  "user_id"
     t.datetime "onclick_time"
@@ -1402,6 +1691,23 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.integer  "allow_teacher",        :default => 0
   end
 
+  create_table "permissions", :force => true do |t|
+    t.string  "controller",   :limit => 30, :default => "",    :null => false
+    t.string  "action",       :limit => 30, :default => "",    :null => false
+    t.string  "description",  :limit => 60, :default => "",    :null => false
+    t.boolean "is_public",                  :default => false, :null => false
+    t.integer "sort",                       :default => 0,     :null => false
+    t.boolean "mail_option",                :default => false, :null => false
+    t.boolean "mail_enabled",               :default => false, :null => false
+  end
+
+  create_table "permissions_roles", :id => false, :force => true do |t|
+    t.integer "permission_id", :default => 0, :null => false
+    t.integer "role_id",       :default => 0, :null => false
+  end
+
+  add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
+
   create_table "phone_app_versions", :force => true do |t|
     t.string   "version"
     t.text     "description"
@@ -1484,6 +1790,11 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "project_import_data", :force => true do |t|
+    t.integer "project_id"
+    t.text    "data"
+  end
+
   create_table "project_infos", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1563,6 +1874,7 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.integer  "hot",                    :default => 0
     t.string   "invite_code"
     t.string   "qrcode"
+    t.integer  "qrcode_expiretime",      :default => 0
   end
 
   add_index "projects", ["lft"], :name => "index_projects_on_lft"
@@ -1576,6 +1888,16 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
   add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
   add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
 
+  create_table "protected_branches", :force => true do |t|
+    t.integer  "project_id",                             :null => false
+    t.string   "name",                                   :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "developers_can_push", :default => false, :null => false
+  end
+
+  add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id"
+
   create_table "pull_requests", :force => true do |t|
     t.integer  "pull_request_id"
     t.integer  "gpid"
@@ -1732,6 +2054,25 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.integer  "is_teacher_score",              :default => 0
   end
 
+  create_table "services", :force => true do |t|
+    t.string   "type"
+    t.string   "title"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "active",                :default => false, :null => false
+    t.text     "properties"
+    t.boolean  "template",              :default => false
+    t.boolean  "push_events",           :default => true
+    t.boolean  "issues_events",         :default => true
+    t.boolean  "merge_requests_events", :default => true
+    t.boolean  "tag_push_events",       :default => true
+    t.boolean  "note_events",           :default => true,  :null => false
+  end
+
+  add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id"
+  add_index "services", ["project_id"], :name => "index_services_on_project_id"
+
   create_table "settings", :force => true do |t|
     t.string   "name",       :default => "", :null => false
     t.text     "value"
@@ -1770,6 +2111,26 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.datetime "updated_at",     :null => false
   end
 
+  create_table "snippets", :force => true do |t|
+    t.string   "title"
+    t.text     "content",          :limit => 2147483647
+    t.integer  "author_id",                                             :null => false
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "file_name"
+    t.datetime "expires_at"
+    t.string   "type"
+    t.integer  "visibility_level",                       :default => 0, :null => false
+  end
+
+  add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id"
+  add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id"
+  add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at"
+  add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at"
+  add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id"
+  add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level"
+
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -1923,6 +2284,17 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.datetime "updated_at",      :null => false
   end
 
+  create_table "subscriptions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "subscribable_id"
+    t.string   "subscribable_type"
+    t.boolean  "subscribed"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true
+
   create_table "syllabus_members", :force => true do |t|
     t.integer  "rank"
     t.integer  "syllabus_id"
@@ -2196,6 +2568,17 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
   add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
   add_index "users", ["type"], :name => "index_users_on_type"
 
+  create_table "users_star_projects", :force => true do |t|
+    t.integer  "project_id", :null => false
+    t.integer  "user_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id"
+  add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true
+  add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id"
+
   create_table "versions", :force => true do |t|
     t.integer  "project_id",      :default => 0,      :null => false
     t.string   "name",            :default => "",     :null => false
@@ -2247,6 +2630,23 @@ ActiveRecord::Schema.define(:version => 20160921062340) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "web_hooks", :force => true do |t|
+    t.string   "url"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type",                  :default => "ProjectHook"
+    t.integer  "service_id"
+    t.boolean  "push_events",           :default => true,          :null => false
+    t.boolean  "issues_events",         :default => false,         :null => false
+    t.boolean  "merge_requests_events", :default => false,         :null => false
+    t.boolean  "tag_push_events",       :default => false
+    t.boolean  "note_events",           :default => false,         :null => false
+  end
+
+  add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id"
+  add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id"
+
   create_table "wechat_logs", :force => true do |t|
     t.string   "openid",       :null => false
     t.text     "request_raw"

From 2e94fbee8144fe707dbb99c3fabe211e7d0e34cf Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 9 Oct 2016 15:09:18 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E3=80=81=E7=BB=84=E7=BB=87=E8=B5=84=E6=BA=90=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E8=BF=87=E9=95=BF=E4=B8=8D=E8=83=BD=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb          |  9 ++++++++-
 app/views/files/_org_subfield_list.html.erb  | 11 +++++++++--
 app/views/files/_project_list.html.erb       | 11 +++++++++--
 app/views/files/_resource_detail.html.erb    | 13 ++++++++++---
 app/views/files/edit_file_description.js.erb |  3 +++
 config/routes.rb                             |  3 +++
 6 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 app/views/files/edit_file_description.js.erb

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 7318a4dc2..54babdd64 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -26,7 +26,7 @@ class FilesController < ApplicationController
   before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,
                                         :search_tag_attachment,:subfield_upload_file,:search_org_subfield_tag_attachment,
                                         :search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,
-                                        :search_files_in_subfield,:upload_files_menu,:file_hidden,:republish_file,:update_file_description]
+                                        :search_files_in_subfield,:upload_files_menu,:file_hidden,:republish_file,:update_file_description, :edit_file_description]
 
   helper :sort
   include SortHelper
@@ -981,6 +981,13 @@ class FilesController < ApplicationController
   def upload_files_menu
 
   end
+
+  def edit_file_description
+    @attachment = Attachment.find(params[:id])
+    @attachment.description = params[:file_description_edit]
+    @attachment.save
+  end
+
   def update_file_description
     @attachment = Attachment.find(params[:id])
     @attachment.description = params[:description]
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index de37ed054..45aa7095b 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -43,8 +43,10 @@
                   <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>
                   </div>
-                  <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
-                            onblur="edit_file_description('<%= update_file_description_org_subfield_file_path(file.container,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+                  <%= form_tag(edit_file_description_org_subfield_file_path(file, :org_subfield_id => org_subfield.id ),:remote=>'true', :method => :post, :id=>"files_query_form_#{file.id}") do %>
+                      <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" name="file_description_edit" id="file_description_edit_<%= file.id %>"
+                                onblur="commit_files_description('#files_query_form_<%= file.id %>');"><%= file.description %></textarea>
+                  <% end %>
                 </div>
             <% else %>
                 <div class="fontGrey2 mb4">
@@ -108,3 +110,8 @@
     <%end%>
 <% end%>
 
+<script>
+    function commit_files_description(id) {
+        $(id).submit();
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb
index faf254015..3193f4b42 100644
--- a/app/views/files/_project_list.html.erb
+++ b/app/views/files/_project_list.html.erb
@@ -40,8 +40,10 @@
                     <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                       <%= render :partial => 'files/file_description', :locals => {:file => file} %>
                     </div>
-                    <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
-                              onblur="edit_file_description('<%= update_file_description_project_file_path(project,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+                    <%= form_tag(edit_file_description_project_file_path(file, :project_id => project.id),:remote=>'true', :method => :post, :id=>"files_query_form_#{file.id}") do %>
+                        <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" name="file_description_edit" id="file_description_edit_<%= file.id %>"
+                                  onblur="commit_files_description('#files_query_form_<%= file.id %>');"><%= file.description %></textarea>
+                    <% end %>
                   </div>
               <% else %>
                     <div class="fontGrey2 mb4">
@@ -70,6 +72,11 @@
   <%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true%>
 </ul>
 
+<script>
+    function commit_files_description(id) {
+        $(id).submit();
+    }
+</script>
 
 
 
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index b60814afd..08b85ab2f 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -42,8 +42,10 @@
               <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>
               </div>
-              <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
-                        onblur="edit_file_description('<%= update_file_description_course_file_path(@course,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+              <%= form_tag(edit_file_description_course_file_path(file, :course_id => @course.id),:remote=>'true', :method => :post, :id=>"files_query_form_#{file.id}") do %>
+                  <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" name="file_description_edit" id="file_description_edit_<%= file.id %>"
+                            onblur="commit_files_description('#files_query_form_<%= file.id %>');"><%= file.description %></textarea>
+              <% end %>
             </div>
           <% else %>
             <div class="fontGrey2 mb4">
@@ -99,4 +101,9 @@
     </div>
   </div>
 </div>
-<div class="cl"></div>
\ No newline at end of file
+<div class="cl"></div>
+<script>
+    function commit_files_description(id) {
+        $(id).submit();
+    }
+</script>
diff --git a/app/views/files/edit_file_description.js.erb b/app/views/files/edit_file_description.js.erb
new file mode 100644
index 000000000..40b47a2ec
--- /dev/null
+++ b/app/views/files/edit_file_description.js.erb
@@ -0,0 +1,3 @@
+$("#file_description_show_<%= @attachment.id %>").html("<%= escape_javascript render(:partial => "files/file_description", :locals => {:file => @attachment}) %>");
+$("#file_description_show_<%= @attachment.id %>").show();
+$("#file_description_edit_<%= @attachment.id %>").hide();
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 4ff75cbf9..7ca24d861 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -133,6 +133,7 @@ RedmineApp::Application.routes.draw do
       member do
         match "quote_resource_show_org_subfield", :via => [:get]
         get "update_file_description"
+        post "edit_file_description"
       end
     end
 
@@ -809,6 +810,7 @@ RedmineApp::Application.routes.draw do
         match "quote_resource_show", :via => [:get]
         get "file_hidden"
         get "update_file_description"
+        post "edit_file_description"
       end
     end
 
@@ -1219,6 +1221,7 @@ RedmineApp::Application.routes.draw do
         get "file_hidden"
         post "republish_file"
         get "update_file_description"
+        post "edit_file_description"
       end
     end
     resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do

From 125a389448b8e374bb6a0e1f600655cbd8b0874e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 9 Oct 2016 15:33:22 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E2=80=9C=E5=B8=AE=E5=8A=A9=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E2=80=9D500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 378741035..b8235ff1c 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -14,9 +14,12 @@
           <li class="navHomepageMenu fl">
             <%= link_to "题库",  user_homeworks_user_path(User.current), :class => "c_white f16 db p10"%>
           </li>
-          <li class="navHomepageMenu fl mr30">
-            <%= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>
-          </li>
+          <% memo = Memo.where(:id => 1168).first %>
+          <% unless memo.nil? %>
+              <li class="navHomepageMenu fl mr30">
+                <%= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>
+              </li>
+          <% end %>
       <% else %>
           <li class="navHomepageMenu fl mr40">
             <a href="<%= forums_path(:reorder_complex=>'desc')%>" target="_blank" class="c_white f16 db p10" >公共贴吧</a>