Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh

2015-12-21 15:15:48 +08:00 · 2015-12-21 15:15:48 +08:00 · 1724ae430e
parent b235e8de70 c29ab5dc6d
commit 1724ae430e
28 changed files with 389 additions and 38 deletions
--- a/6
+++ b/6
@ -49,7 +49,7 @@ group :development do
  end
 end

-group :development, :test do 
+group :development, :test do
  unless RUBY_PLATFORM =~ /w32/
    gem 'pry-rails'
    if RUBY_VERSION >= '2.0.0'
@ -58,7 +58,7 @@ group :development, :test do
    gem 'pry-stack_explorer'
    if RUBY_PLATFORM =~ /darwin/
      gem 'puma'
-  end
+    end
  end

  gem 'rspec-rails', '~> 3.0'
@ -72,7 +72,7 @@ group :assets do
  gem 'coffee-rails', '~> 3.2.1'

  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-   gem 'therubyracer', :platforms => :ruby
+  gem 'therubyracer', :platforms => :ruby

  gem 'uglifier', '>= 1.0.3'
 end
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@ -175,6 +175,7 @@ class HomeworkCommonController < ApplicationController
          end
        end
        @homework_detail_manual.update_column('comment_status', 2)
+        @homework_detail_manual.update_column('evaluation_start', Date.today)
        @statue = 1
        # 匿评开启消息邮件通知
        send_message_anonymous_comment(@homework, m_status = 2)
@ -194,6 +195,7 @@ class HomeworkCommonController < ApplicationController
  #关闭匿评
  def stop_anonymous_comment
    @homework_detail_manual.update_column('comment_status', 3)
+    @homework_detail_manual.update_column('evaluation_end', Date.today)
    #计算缺评扣分
    work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
    @homework.student_works.each do |student_work|
@ -274,7 +276,13 @@ class HomeworkCommonController < ApplicationController

  #启动匿评参数设置
  def start_evaluation_set
-
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+    else
+      @user_activity_id = -1
+    end
+    @is_in_course = params[:is_in_course]
+    @course_activity = params[:course_activity].to_i
  end

  #设置匿评参数
@ -290,6 +298,9 @@ class HomeworkCommonController < ApplicationController

      @homework_detail_manual.evaluation_num = params[:evaluation_num]
      @homework_detail_manual.save
+      @user_activity_id = params[:user_activity_id].to_i
+      @is_in_course = params[:is_in_course].to_i
+      @course_activity = params[:course_activity].to_i
    end
  end

--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -185,7 +185,7 @@ class IssuesController < ApplicationController
      respond_to do |format|
        format.html {
          render_attachment_warning_if_needed(@issue)
-          flash[:notice] = l(:label_successful_create)
+          #flash[:notice] = l(:label_successful_create)
          #flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("#{@issue.subject}", issue_path(@issue), :title => @issue.subject))
          #flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
          if params[:continue]
--- a/app/helpers/project_score_helper.rb
+++ b/app/helpers/project_score_helper.rb
@ -22,10 +22,10 @@ module ProjectScoreHelper

  #代码提交数量
  def changesets_num project
-    # g = Gitlab.client
-    # project.gpid.nil? ? 0 : g.commits_total_count(project.gpid)
-    # commits_total_count(project.gpid)
-    project.changesets.count
+    g = Gitlab.client
+    project.gpid.nil? ? 0 : g.commits_total_count(project.gpid).count
+    # # commits_total_count(project.gpid)
+    # project.changesets.count
  end

  #讨论区帖子数量
--- a/app/models/news.rb
+++ b/app/models/news.rb
@ -41,7 +41,7 @@ class News < ActiveRecord::Base
  validates_presence_of :title, :description
  validates_length_of :title, :maximum => 60
  validates_length_of :summary, :maximum => 255
-  validates_length_of :description, :maximum => 10000
+  # validates_length_of :description, :maximum => 10000

  acts_as_attachable :delete_permission => :manage_news
  acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :project
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@ -107,7 +107,7 @@ class Repository < ActiveRecord::Base
  def scm
    unless @scm
      @scm = self.scm_adapter.new(url, root_url,
-                                  login, password, path_encoding)
+                                  login, password, path_encoding, project_id)
      if root_url.blank? && @scm.root_url.present?
        update_attribute(:root_url, @scm.root_url)
      end
--- a/app/views/homework_common/_set_evalutation_att.html.erb
+++ b/app/views/homework_common/_set_evalutation_att.html.erb
@ -1,5 +1,5 @@
 <div class="markPopup" id="popbox02">
-  <%= form_for('new_form',:url =>  {:controller => 'homework_common',:action => 'set_evaluation_attr',:homework => @homework.id},:method => "post",:remote => true) do |f|%>
+  <%= form_for('new_form',:url =>  {:controller => 'homework_common',:action => 'set_evaluation_attr',:homework => @homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity},:method => "post",:remote => true) do |f|%>
      <span class="uploadText">匿评设置</span>
      <div class="cl"></div>

--- a/app/views/homework_common/set_evaluation_attr.js.erb
+++ b/app/views/homework_common/set_evaluation_attr.js.erb
@ -1 +1,8 @@
-clickCanel();
+clickCanel();
+<% if @user_activity_id != -1 %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@courae_activity}) %>");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
+<% else %>
+$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
+init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
+<% end %>
--- a/app/views/homework_common/start_anonymous_comment.js.erb
+++ b/app/views/homework_common/start_anonymous_comment.js.erb
@ -2,9 +2,11 @@
    alert('启动成功');
    <% if @user_activity_id == -1 %>
        $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
+        $("#evaluation_start_time_<%=@homework.id %>").html("匿评开启时间：<%=format_time(Time.now) %>");
        init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
    <% else %>
        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
+        $("#evaluation_start_time_<%=@user_activity_id %>").html("匿评开启时间：<%=format_time(Time.now) %>");
        init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
    <% end %>
 /*$("#<%#= @homework.id %>_start_anonymous_comment").replaceWith('<%#= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');*/
--- a/app/views/homework_common/start_evaluation_set.js.erb
+++ b/app/views/homework_common/start_evaluation_set.js.erb
@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_common/set_evalutation_att') %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_common/set_evalutation_att',:locals => {:user_activity_id => @user_activity_id,:is_in_course => @is_in_course,:course_activity =>@course_activity,:remote=>true}) %>');
 var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: 0, showOn: 'button', buttonImageOnly: true, buttonImage: '/images/public_icon.png', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};
 showModal('ajax-modal', '350px');
 $('#ajax-modal').siblings().remove();
--- a/app/views/homework_common/stop_anonymous_comment.js.erb
+++ b/app/views/homework_common/stop_anonymous_comment.js.erb
@ -1,9 +1,11 @@
 alert('关闭成功');
 <% if @user_activity_id == -1 %>
 $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
+$("#evaluation_end_time_<%=@homework.id %>").html("匿评关闭时间：<%=format_time(Time.now) %>");
 init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
 <% else %>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
+$("#evaluation_end_time_<%=@user_activity_id %>").html("匿评关闭时间：<%=format_time(Time.now) %>");
 init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
 <% end %>
 /*
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@ -7,7 +7,7 @@
              <label class="label"><span class="c_red f12">*</span>&nbsp;类型&nbsp;&nbsp;:&nbsp;</label>
              <%= f.select :tracker_id, @issue.project.trackers.collect { |t| [t.name, t.id] },
                        {:required => true, :no_label => true},
-                         :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
+                         #:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
                         :class => "w90" %>
          <% end %>
        </li>
@ -49,7 +49,7 @@
              <%= f.label_for_field :description, :required => @issue.required_attribute?('description'), :no_label => true, :class => "label" %>
              <%#= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
              <%#= content_tag 'span', :id => "issue_description_and_toolbar" do %>
-              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",  :width=>'87%', :resizeType => 0, :no_label => true,at_id: @project.id, at_type: @project.class.to_s %>
+              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",  :width=>'85%', :resizeType => 0, :no_label => true,at_id: @project.id, at_type: @project.class.to_s %>
              <%# end %>
              <%#= wikitoolbar_for 'issue_description' %>
          <% end %>
--- a/app/views/issues/update.js.erb
+++ b/app/views/issues/update.js.erb
@ -12,12 +12,25 @@ issue_desc_editor = KindEditor.create('#issue_description',
        {"width":"85%",
            "resizeType":0,
            "no_label":true,
+            "at_id":<%= @issue.project_id%>,
+            "at_type":"Project",
            "autoHeightMode":true,
-            "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin(\"autoheight\")})",
-            "emotionsBasePath":"http://localhost:3000","height":300,
+            "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);};if(typeof enableAt ==='function'){enableAt(self, \"<%=@issue.project_id %>\", 'Project');}; this.loadPlugin('autoheight')})",
+            "emotionsBasePath":'<%= Setting.host_name%>',
+            "height":300,
            "allowFileManager":true,
            "uploadJson":"/kindeditor/upload",
            "fileManagerJson":"/kindeditor/filemanager"});
+//issue_desc_editor = KindEditor.create('#issue_description',
+//        {"width":"85%",
+//            "resizeType":0,
+//            "no_label":true,
+//            "autoHeightMode":true,
+//            "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin(\"autoheight\")})",
+//            "emotionsBasePath":"http://localhost:3000","height":300,
+//            "allowFileManager":true,
+//            "uploadJson":"/kindeditor/upload",
+//            "fileManagerJson":"/kindeditor/filemanager"});
 <%else%>
    alert('<%=  @issue.errors.full_messages[0].to_s%>')
 <%end %>
--- a/app/views/student_work/set_score_rule.js.erb
+++ b/app/views/student_work/set_score_rule.js.erb
@ -1,5 +1,5 @@
 clickCanel();
-<% if @user_activity_id %>
+<% if @user_activity_id != -1 %>
    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@courae_activity}) %>");
    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
 <% else %>
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@ -102,7 +102,7 @@
        <div class="homepagePostDeadline">
          迟交扣分：<%= activity.late_penalty%>分
        </div>
-        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;">
+        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_start_time_<%=user_activity_id %>">
          匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%>&nbsp;00:00
        </div>
      </div>
@ -111,7 +111,7 @@
        <div class="homepagePostDeadline">
          缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
        </div>
-        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;">
+        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=user_activity_id %>">
          匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59
        </div>
      </div>
@ -172,7 +172,7 @@
                  </li>
                  <% if activity.anonymous_comment == 0 %>
                      <li>
-                        <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
+                        <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
                      </li>
                      <li>
                        <%= homework_anonymous_comment activity,-1,user_activity_id,course_activity %>
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@ -107,7 +107,7 @@
        <div class="homepagePostDeadline">
          迟交扣分：<%= homework_common.late_penalty%>分
        </div>
-        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;">
+        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_start_time_<%=homework_common.id %>">
          匿评开启时间：<%= homework_common.homework_detail_manual.evaluation_start%>&nbsp;00:00
        </div>
      </div>
@ -116,7 +116,7 @@
        <div class="homepagePostDeadline">
          缺评扣分：<%= homework_common.homework_detail_manual.absence_penalty%>分/作品
        </div>
-        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;">
+        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=homework_common.id %>">
          匿评关闭时间：<%= homework_common.homework_detail_manual.evaluation_end%>&nbsp;23:59
        </div>
      </div>
@ -177,7 +177,7 @@
                  </li>
                  <% if homework_common.anonymous_comment == 0 &&(comment_status == 0 || comment_status == 1)%>
                    <li>
-                        <%= link_to("匿评设置", start_evaluation_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true)%>
+                        <%= link_to("匿评设置", start_evaluation_set_homework_common_path(homework_common, :is_in_course => is_in_course,:course_activity=>-1),:class => "postOptionLink", :remote => true)%>
                    </li>
                  <% end %>
                  <% if homework_common.anonymous_comment == 0%>
--- a/config/configuration.yml.template
+++ b/config/configuration.yml.template
@ -0,0 +1,235 @@
+# = Redmine configuration file
+#
+# Each environment has it's own configuration options.  If you are only
+# running in production, only the production block needs to be configured.
+# Environment specific configuration options override the default ones.
+#
+# Note that this file needs to be a valid YAML file.
+# DO NOT USE TABS! Use 2 spaces instead of tabs for identation.
+#
+# == Outgoing email settings (email_delivery setting)
+#
+# === Common configurations
+#
+# ==== Sendmail command
+#
+# production:
+#   email_delivery:
+#     delivery_method: :sendmail
+#
+# ==== Simple SMTP server at localhost
+#
+# production:
+#   email_delivery:
+#     delivery_method: :smtp
+#     smtp_settings:
+#       address: smtp.163.com
+#       port: 25
+#
+# ==== SMTP server at example.com using LOGIN authentication and checking HELO for foo.com
+#
+# production:
+#   email_delivery:
+#     delivery_method: :smtp
+#     smtp_settings:
+#       address: smtp.gmail.com
+#       port: 587
+#       authentication: :login
+#       domain: 'foo.com'
+#       user_name: senluowanxiangt@gmail.com
+#       password: 1913TXBja
+#
+# ==== SMTP server at example.com using PLAIN authentication
+#
+# production:
+#   email_delivery:
+#     delivery_method: :smtp
+#     smtp_settings:
+#       address: smtp.gmail.com
+#       port: 587
+#       authentication: :plain
+#       domain: 'example.com'
+#       user_name: senluowanxiangt@gmail.com
+#       password: 1913TXBja
+#
+# ==== SMTP server at using TLS (GMail)
+#
+# This might require some additional configuration. See the guides at:
+# http://www.redmine.org/projects/redmine/wiki/EmailConfiguration
+#
+# production:
+#   email_delivery:
+#     delivery_method: :smtp
+#     smtp_settings:
+#       enable_starttls_auto: true
+#       address: smtp.gmail.com
+#       port: 587
+#       domain: "smtp.gmail.com" # 'your.domain.com' for GoogleApps
+#       authentication: :plain
+#       user_name: senluowanxiangt@gmail.com
+#       password: 1913TXBja
+#
+#
+# === More configuration options
+#
+# See the "Configuration options" at the following website for a list of the
+# full options allowed:
+#
+# http://wiki.rubyonrails.org/rails/pages/HowToSendEmailsWithActionMailer
+
+
+
+default:
+  email_delivery:
+    delivery_method: :smtp
+    smtp_settings:
+          address: mail.trustie.net
+          port: 25
+          domain: mail.trustie.net
+          authentication: :login
+          user_name: "mail@trustie.net"
+          password: "loong2010"
+
+  # Absolute path to the directory where attachments are stored.
+  # The default is the 'files' directory in your Redmine instance.
+  # Your Redmine instance needs to have write permission on this
+  # directory.
+  # Examples:
+  # attachments_storage_path: /var/redmine/files
+  # attachments_storage_path: D:/redmine/files
+  attachments_storage_path:
+
+  # Configuration of the autologin cookie.
+  # autologin_cookie_name: the name of the cookie (default: autologin)
+  # autologin_cookie_path: the cookie path (default: /)
+  # autologin_cookie_secure: true sets the cookie secure flag (default: false)
+  autologin_cookie_name: "autologin_trustie"
+  autologin_cookie_path:
+  autologin_cookie_secure:
+
+  # Configuration of SCM executable command.
+  #
+  # Absolute path (e.g. /usr/local/bin/hg) or command name (e.g. hg.exe, bzr.exe)
+  # On Windows + CRuby, *.cmd, *.bat (e.g. hg.cmd, bzr.bat) does not work.
+  #
+  # On Windows + JRuby 1.6.2, path which contains spaces does not work.
+  # For example, "C:\Program Files\TortoiseHg\hg.exe".
+  # If you want to this feature, you need to install to the path which does not contains spaces.
+  # For example, "C:\TortoiseHg\hg.exe".
+  #
+  # Examples:
+  # scm_subversion_command: svn                                       # (default: svn)
+  # scm_mercurial_command:  C:\Program Files\TortoiseHg\hg.exe        # (default: hg)
+  # scm_git_command:        /usr/local/bin/git                        # (default: git)
+  # scm_cvs_command:        cvs                                       # (default: cvs)
+  # scm_bazaar_command:     bzr.exe                                   # (default: bzr)
+  # scm_darcs_command:      darcs-1.0.9-i386-linux                    # (default: darcs)
+  #
+  scm_subversion_command:
+  scm_mercurial_command:
+  scm_git_command:
+  scm_cvs_command:
+  scm_bazaar_command:
+  scm_darcs_command:
+
+  # Absolute path to the SCM commands errors (stderr) log file.
+  # The default is to log in the 'log' directory of your Redmine instance.
+  # Example:
+  # scm_stderr_log_file: /var/log/redmine_scm_stderr.log
+  scm_stderr_log_file:
+
+  # Key used to encrypt sensitive data in the database (SCM and LDAP passwords).
+  # If you don't want to enable data encryption, just leave it blank.
+  # WARNING: losing/changing this key will make encrypted data unreadable.
+  #
+  # If you want to encrypt existing passwords in your database:
+  # * set the cipher key here in your configuration file
+  # * encrypt data using 'rake db:encrypt RAILS_ENV=production'
+  #
+  # If you have encrypted data and want to change this key, you have to:
+  # * decrypt data using 'rake db:decrypt RAILS_ENV=production' first
+  # * change the cipher key here in your configuration file
+  # * encrypt data using 'rake db:encrypt RAILS_ENV=production'
+  database_cipher_key:
+
+  # Set this to false to disable plugins' assets mirroring on startup.
+  # You can use `rake redmine:plugins:assets` to manually mirror assets
+  # to public/plugin_assets when you install/upgrade a Redmine plugin.
+  #
+  #mirror_plugins_assets_on_startup: false
+
+  # Your secret key for verifying cookie session data integrity. If you
+  # change this key, all old sessions will become invalid! Make sure the
+  # secret is at least 30 characters and all random, no regular words or
+  # you'll be exposed to dictionary attacks.
+  #
+  # If you have a load-balancing Redmine cluster, you have to use the
+  # same secret token on each machine.
+  #secret_token: 'change it to a long random string'
+
+  # Absolute path (e.g. /usr/bin/convert, c:/im/convert.exe) to
+  # the ImageMagick's `convert` binary. Used to generate attachment thumbnails.
+  imagemagick_convert_command: '/home/pdl/redmine-2.3.2-0/common/bin/convert'
+
+  # Configuration of RMagcik font.
+  #
+  # Redmine uses RMagcik in order to export gantt png.
+  # You don't need this setting if you don't install RMagcik.
+  #
+  # In CJK (Chinese, Japanese and Korean),
+  # in order to show CJK characters correctly,
+  # you need to set this configuration.
+  #
+  # Because there is no standard font across platforms in CJK,
+  # you need to set a font installed in your server.
+  #
+  # This setting is not necessary in non CJK.
+  #
+  # Examples for Japanese:
+  #   Windows:
+  #     rmagick_font_path: C:\windows\fonts\msgothic.ttc
+  #   Linux:
+  #     rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
+  #
+  rmagick_font_path:
+
+  # Maximum number of simultaneous AJAX uploads
+  #max_concurrent_ajax_uploads: 2
+  #pic_types: "bmp,jpeg,jpg,png,gif"
+
+  repository_root_path: '/tmp/htdocs'
+  judge_server: 'http://judge.trustie.net/'
+
+  # Git's url
+  gitlab_address: 'http://gitfast.trustie.net'
+
+# specific configuration options for production environment
+# that overrides the default ones
+production:
+  # CJK support
+  rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
+  judge_server: 'http://192.168.80.21:8080/'
+  repository_root_path: '/home/pdl/redmine-2.3.2-0/apache2/htdocs'
+  cookie_domain: ".trustie.net"
+  email_delivery:
+    delivery_method: :smtp
+    smtp_settings:
+      address: mail.trustie.net
+      port: 25
+      domain: mail.trustie.net
+      authentication: :login
+      user_name: "mail@trustie.net"
+      password: "loong2010"
+
+# specific configuration options for development environment
+# that overrides the default ones
+development:
+  email_delivery:
+    delivery_method: :smtp
+    smtp_settings:
+      address: mail.trustie.net
+      port: 25
+      domain: mail.trustie.net
+      authentication: :login
+      user_name: "mail@trustie.net"
+      password: "loong2010"
--- a/config/initializers/gitlab_config.rb.template
+++ b/config/initializers/gitlab_config.rb.template
@ -0,0 +1,9 @@
+Gitlab.configure do |config|
+  # config.endpoint       = 'http://192.168.41.130:3000/trustie/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
+  # config.private_token  = 'cK15gUDwvt8EEkzwQ_63'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
+  config.endpoint       = 'http://gitfast.trustie.net/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
+  config.private_token  = 'fPc_gBmEiSANve8TCfxW'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
+  # Optional
+  # config.user_agent   = 'Custom User Agent'          # user agent, default: 'Gitlab Ruby Gem [version]'
+  # config.sudo         = 'user'                       # username for sudo mode, default: nil
+end
--- a/db/migrate/20151218110033_add_commits_count_to_projects.rb
+++ b/db/migrate/20151218110033_add_commits_count_to_projects.rb
@ -0,0 +1,5 @@
+class AddCommitsCountToProjects < ActiveRecord::Migration
+  def change
+    add_column :projects, :commits_count, :integer, default: 0
+  end
+end
--- 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 => 20151218022014) do
+ActiveRecord::Schema.define(:version => 20151218110033) do

  create_table "activities", :force => true do |t|
    t.integer  "act_id",                                  :null => false
@ -1361,6 +1361,7 @@ ActiveRecord::Schema.define(:version => 20151218022014) do
    t.integer  "gpid"
    t.integer  "forked_from_project_id"
    t.integer  "forked_count"
+    t.integer  "commits_count",          :default => 0
  end

  add_index "projects", ["lft"], :name => "index_projects_on_lft"
--- a/lib/gitlab-cli/lib/gitlab/client/repositories.rb
+++ b/lib/gitlab-cli/lib/gitlab/client/repositories.rb
@ -102,5 +102,12 @@ class Gitlab::Client
      get("/projects/#{project}/repository/commits/#{sha}/diff") 
    end
    alias_method :repo_commit_diff, :commit_diff
+
+    #Get the commits count of each contributor in a project
+    #@param [Integer] project the ID fo a project.
+    # @return [Gitlab::ObjectifiedHash]
+    def contributors(project)
+      get("/projects/#{project}/repository/contributors")
+    end
  end
 end
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@ -80,7 +80,7 @@ module Redmine
        end

        def initialize(url, root_url=nil, login=nil, password=nil,
-                       path_encoding=nil)
+                       path_encoding=nil, project_id)
          @url = url
          @login = login if login && !login.empty?
          @password = (password || "") if @login
--- a/lib/redmine/scm/adapters/gitlab_adapter.rb
+++ b/lib/redmine/scm/adapters/gitlab_adapter.rb
@ -13,10 +13,12 @@ module Redmine
          attr_accessor :is_default
        end

-        def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil)
+        def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil, project_id)
          super
          @g = Gitlab.client
-          @project = Repository.find_by_url(url).project.gpid
+          r = Repository.where("url =? and project_id =?", url, project_id).first
+          @project = r.project.gpid
+          # @project = Repository.find_by_url(url).project.gpid
          @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
        end

--- a/lib/tasks/project_commits_query.rake
+++ b/lib/tasks/project_commits_query.rake
@ -0,0 +1,30 @@
+#coding=utf-8
+
+namespace :gitlab do
+  desc "sync gitlab's users which lost in last sync"
+  task :query => :environment do
+    g = Gitlab.client
+    projects = Project.all
+    users_email = User.find_by_sql("select mail from users where mail != '' ")
+    projects.each do|project|
+      gpid = project.gpid
+      begin
+        contributors_list = g.contributors(gpid)
+      rescue
+        next
+      end
+      puts "project_id  #{project.id}"
+      contributors_list.each do|contributor|
+        if users_email.include?(contributor.email)
+          contributors_list.delete(contributor)
+        end
+      end
+
+      contributors_list.each do|contributor|
+        puts "name #{contributor.name}"
+        puts "email  #{contributor.email}"
+        puts "commits_count  #{contributor.commits}"
+      end
+   end
+  end
+end
--- a/lib/tasks/update_project_commits.rake
+++ b/lib/tasks/update_project_commits.rake
@ -0,0 +1,26 @@
+# #coding=utf-8
+#
+# namespace :projects do
+#   desc "sync some projects which just have sigle repository"
+#   task :commits_count => :environment do
+#     projects = Project.where("gpid is not null")
+#     puts projects.count
+#     projects.each do |project|
+#       unless project.gpid.nil?
+#         begin
+#         url = "https://gittest.trustie.net/api/v3/projects/#{project.gpid}/repository/commits_total_count?private_token=kZUYYbAY12QSQ2Tx1zes&ref_name=master"
+#         require 'net/http'
+#         count =  Net::HTTP.get(URI(url))
+#         puts "count is ===>#{count}"
+#         ensure
+#           puts "**************** #{project.id}"
+#         end
+#         project.update_attributes(:commits_count => count)
+#       end
+#
+#     end
+#   end
+#
+#   task :delete_rep => :environment do
+#   end
+# end
--- a/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb
+++ b/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb
@ -13,11 +13,12 @@ issue_desc_editor = KindEditor.create('#issue_description',
        {"width":"85%",
            "resizeType":0,
            "no_label":true,
+            "at_id":<%= @issue.project_id%>,
+            "at_type":"Project",
            "autoHeightMode":true,
-            "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin(\"autoheight\"),$(this.toolbar.div).hide();})",
-            "afterFocus":"eval(function(){$(this.toolbar.div).show();})",
-            "afterBlur":"eval(function(){$(this.toolbar.div).hide();})",
-            "emotionsBasePath":"http://localhost:3000",
-            "height":300,"allowFileManager":true,
+            "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);};if(typeof enableAt ==='function'){enableAt(self, "<%=@issue.project_id %>", 'Project');}; this.loadPlugin('autoheight')})",
+            "emotionsBasePath":'<%= Setting.host_name%>',
+            "height":300,
+            "allowFileManager":true,
            "uploadJson":"/kindeditor/upload",
            "fileManagerJson":"/kindeditor/filemanager"});
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@ -299,12 +299,12 @@ function regexDescription()
        $("#description_notice_span").focus();
        return false;
    }
-    else if(name.length >=6000){
+    /*else if(name.length >=6000){
        $("#description_notice_span").text("描述最多3000个汉字(或6000个英文字符)");
        $("#description_notice_span").css('color','#ff0000');
        $("#description_notice_span").focus();
        return false;
-    }
+    }*/
    else
    {
        $("#description_notice_span").text("填写正确");
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@ -248,13 +248,13 @@ function regexDescription() {
        $("#description_notice_span").focus();
        return false;
    }
-    else if (name.length > 10000)
+    /*else if (name.length > 10000)
    {
        $("#description_notice_span").text("描述超过10000个字符");
        $("#description_notice_span").css('color', '#ff0000');
        $("#description_notice_span").focus();
        return false;
-    }
+    }*/
    else {
        $("#description_notice_span").text("填写正确");
        $("#description_notice_span").css('color', '#008000');