diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index a132ec295..9b81ac775 100644
--- 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]
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 8eb6a6860..e939511b6 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -351,7 +351,7 @@ update
       @changesets = g.commits(@project.gpid, :ref_name => @rev)
       # @changesets = @repository.latest_changesets(@path, @rev)
       # @changesets_count = @repository.latest_changesets(@path, @rev).count
-      @changesets_all_count = 0
+      @changesets_all_count = @project.gpid.nil? ? 0 : g.commits_total_count(@project.gpid).count
       @changesets_latest_coimmit = @changesets[0]
       @properties = @repository.properties(@path, @rev)
       @repositories = @project.repositories
@@ -383,10 +383,10 @@ update
     @commits = g.commits(@project.gpid, page:(params[:page].to_i - 1).to_s)
 
     #add by hx
-    rep_count = commit_count(@project)
+    #rep_count = commit_count(@project)
 
     #页面传递必须要str类型,但是Paginator的初始化必须要num类型,需要类型转化
-    @commits_count = rep_count
+    @commits_count = params[:commit_count].to_i
     @commits_pages = Redmine::Pagination::Paginator.new @commits_count,limit,params[:page]
 
     @commit = g.commit(@project.gpid,@rev)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index f50f37f31..571bba1b9 100644
--- 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
diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 62d3ff8a5..464104335 100644
--- 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 %>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index da7f79dd8..e5f331d6c 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -51,9 +51,8 @@
             <%= @repository.branches.count %></font> 个分支
         </span>
 
-        <span class="fr mr5"><font class="fb ml2 mr2 vl_commit">
-
-            <%=link_to"提交明细", {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %></font>
+         <span class="fr mr5"><font class="fb ml2 mr2 vl_commit">
+           <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %></font> 提交
 
         </span>
       </div>
diff --git a/db/schema.rb b/db/schema.rb
index 8e946c493..52c7755e9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1569,6 +1569,7 @@ ActiveRecord::Schema.define(:version => 20151218110033) do
   end
 
   add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
+  add_index "student_works", ["homework_common_id"], :name => "index"
 
   create_table "student_works_evaluation_distributions", :force => true do |t|
     t.integer  "student_work_id"
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 3e51f2d4d..2dd520b92 100644
--- 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
diff --git a/lib/redmine/scm/adapters/gitlab_adapter.rb b/lib/redmine/scm/adapters/gitlab_adapter.rb
index 32429fe35..7b2d18310 100644
--- 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