From 8a53978d2397644004b9472b61fc846e2d0e254d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 18 Dec 2015 14:51:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BE=97=E5=88=86?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/project_score_helper.rb  | 4 +++-
 app/views/repositories/show.html.erb | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/helpers/project_score_helper.rb b/app/helpers/project_score_helper.rb
index 256e35a7a..4049cdd76 100644
--- a/app/helpers/project_score_helper.rb
+++ b/app/helpers/project_score_helper.rb
@@ -22,7 +22,9 @@ module ProjectScoreHelper
 
   #代码提交数量
   def changesets_num project
-    # commit_count(project)
+    # g = Gitlab.client
+    # project.gpid.nil? ? 0 : g.commits_total_count(project.gpid)
+    # commits_total_count(project.gpid)
     project.changesets.count
   end
 
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index b385dff1f..da7f79dd8 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -27,7 +27,7 @@
       <div class="fl mt5 ml15"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_zip"></span>ZIP</a> </div>
       <%# 针对公开项目：用户必须创建了项目，否则用户无法同步 %>
       <% if User.current.id != @project.user_id %>
-          <div class="fr mt5"><%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn", :confirm=>"确认要fork该项目吗？" %>
+          <div class="fr mt5"><%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn", :confirm=>"平台将为您创建一个新的同名项目和版本库，请问是否继续？" %>
             <span href="javascript:void(0);" class="vl_btn_2 fb"><%= @project.forked_count.to_i %></span>
           </div>
       <% end %>

From a080306f756e06794f5d76c16b6f71d2dcf6b6fb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 18 Dec 2015 16:05:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=AD=EF=BC=8C=E7=82=B9=E5=87=BB=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=A4=9A=E6=AC=A1=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/views/users/_course_journalsformessage.html.erb | 5 +++--
 public/javascripts/init_activity_KindEditor.js      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 27549f6d9..006743cd7 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -114,7 +114,7 @@
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"),  :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'create_reply', :id => activity.id},:method => "post", :remote => true) do |f|%>
+          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'create_reply', :id => activity.id}, :method => "post", :remote => true) do |f|%>
               <%= hidden_field_tag 'reference_id', params[:reference_id], :value => activity.id %>
               <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => activity.user.id %>
               <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
@@ -132,4 +132,5 @@
       <div class="cl"></div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
+
diff --git a/public/javascripts/init_activity_KindEditor.js b/public/javascripts/init_activity_KindEditor.js
index b0e4b9c59..4c63d1695 100644
--- a/public/javascripts/init_activity_KindEditor.js
+++ b/public/javascripts/init_activity_KindEditor.js
@@ -153,7 +153,7 @@ function init_activity_KindEditor_data(id){
                 params.cancel_btn.click(function () {
                     nh_reset_form(params);
                 });
-                params.submit_btn.click(function () {
+                params.submit_btn.one('click',function () {
                     params.form.submit();
                 });
                 params.textarea.data('init', 1);