Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange

Conflicts:
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突

app/controllers/repositories_controller.rb

@@ -346,27 +346,13 @@ update
       # end
 
 
-      #add by hx
-      if g.commits(@project.gpid , :page=>25).count==0
-        count = count_commits(@project.gpid , 0 , 25)
-      elsif g.commits(@project.gpid , :page=>50).count ==0
-        count = count_commits(@project.gpid , 25 , 50)+ 25 * 20
-      elsif g.commits(@project.gpid , :page=>75).count ==0
-        count = count_commits(@project.gpid , 50 , 75)+ 50 * 20
-      elsif g.commits(@project.gpid , :page=>100).count== 0
-        count = count_commits(@project.gpid , 75 , 100) + 75 * 20
-      elsif g.commits(@project.gpid , :page=>125).count==0
-        count = count_commits(@project.gpid , 100 , 125) + 100 * 20
-      elsif g.commits(@project.gpid , :page=>150).count==0
-        count = count_commits(@project.gpid , 125 , 150) + 125 * 20
-      else
-        count = count_commits(@project.gpid , 150 ,200) + 150 * 20
-      end
+
+
 
       @changesets = g.commits(@project.gpid)
       # @changesets = @repository.latest_changesets(@path, @rev)
       # @changesets_count = @repository.latest_changesets(@path, @rev).count
-      @changesets_all_count = count
+      @changesets_all_count = 0
       @changesets_latest_coimmit = @changesets[0]
       @properties = @repository.properties(@path, @rev)
       @repositories = @project.repositories
@@ -409,8 +395,28 @@ update
     limit = 20
     #每次页面的换回值从1开始,但是gitlab的页面查询是从0开始,所以先改变page的类型减一在改回来
     @commits = g.commits(@project.gpid, page:(params[:page].to_i - 1).to_s)
+
+    #add by hx
+    if g.commits(@project.gpid , :page=>200).count > 0
+      count = 4020
+    elsif g.commits(@project.gpid , :page=>25).count==0
+      count = count_commits(@project.gpid , 0 , 25)
+    elsif g.commits(@project.gpid , :page=>50).count ==0
+      count = count_commits(@project.gpid , 25 , 50)+ 25 * 20
+    elsif g.commits(@project.gpid , :page=>75).count ==0
+      count = count_commits(@project.gpid , 50 , 75)+ 50 * 20
+    elsif g.commits(@project.gpid , :page=>100).count== 0
+      count = count_commits(@project.gpid , 75 , 100) + 75 * 20
+    elsif g.commits(@project.gpid , :page=>125).count==0
+      count = count_commits(@project.gpid , 100 , 125) + 100 * 20
+    elsif g.commits(@project.gpid , :page=>150).count==0
+      count = count_commits(@project.gpid , 125 , 150) + 125 * 20
+    else
+      count = count_commits(@project.gpid , 150 ,200) + 150 * 20
+    end
+
     #页面传递必须要str类型,但是Paginator的初始化必须要num类型,需要类型转化
-    @commits_count = params[:commit_count].to_i
+    @commits_count = count
     @commits_pages = Redmine::Pagination::Paginator.new @commits_count,limit,params[:page]
 
     @commit = g.commit(@project.gpid,@rev)

app/views/repositories/show.html.erb

@@ -52,10 +52,9 @@
         </span>
 
         <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> 提交
+
+            <%=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>
       </div>
   <% end %>

db/schema.rb

@@ -969,7 +969,6 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
     t.integer  "course_group_id",   :default => 0
   end
 
-  add_index "members", ["course_id"], :name => "index_members_on_course_id"
   add_index "members", ["project_id"], :name => "index_members_on_project_id"
   add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
   add_index "members", ["user_id"], :name => "index_members_on_user_id"
@@ -1526,6 +1525,7 @@ ActiveRecord::Schema.define(:version => 20151204062220) 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"