From 7baa5be7eefeffa4b375fb961fc7733d96913f15 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 2 Dec 2016 20:00:15 +0800
Subject: [PATCH] =?UTF-8?q?pull=20request=E6=80=BB=E6=95=B0=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E7=9B=B8=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/pull_requests_controller.rb          |  4 ++--
 app/views/pull_requests/_pull_requests_list.html.erb | 11 ++++++++++-
 app/views/pull_requests/index.html.erb               | 10 ----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 6f245a92b..b6fdd1fee 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -38,12 +38,12 @@ class PullRequestsController < ApplicationController
     @requests_merged_count = merge_requests.select{|request| request.state == "merged"}.count
     @requests_closed_count = merge_requests.select{|request| request.state == "closed"}.count
 
-    @limit = 10
+    @limit = 20
     @is_remote = true
     @count = type_count(type, @requests_opened_count, @requests_merged_count, @requests_closed_count)
     @pages = Paginator.new @count, @limit, params['page'] || 1
     @offset ||= @pages.offset
-    @requests = paginateHelper @requests, 10
+    @requests = paginateHelper @requests, 20
     respond_to do |format|
       format.html
       format.js
diff --git a/app/views/pull_requests/_pull_requests_list.html.erb b/app/views/pull_requests/_pull_requests_list.html.erb
index c594a2e56..9600cb135 100644
--- a/app/views/pull_requests/_pull_requests_list.html.erb
+++ b/app/views/pull_requests/_pull_requests_list.html.erb
@@ -14,8 +14,17 @@
           <div class="c_grey clear mt5">
             <p class="fl">由 <%= link_to get_user_by_login_and(request.author.try(:username)).try(:show_name), user_path(get_user_by_login_and(request.author.try(:username))), :class => "linkBlue2" %> 创建于<%= time_tag(request.created_at) %>前</p>
             <span class="fl ml10"><%= time_tag(request.updated_at) %>前更新</span>
-            <p class="fr"><%= find_gitlab_project(request.source_project_id)+"/"+request.source_branch %><span class="c_grey02 ml10 mr10">合并到</span><%= find_gitlab_project(request.target_project_id)+"/"+request.target_branch %></p>
+            <p class="fr"><%#= find_gitlab_project(request.source_project_id)+"/"+request.source_branch %><span class="c_grey02 ml10 mr10">合并到</span><%#= find_gitlab_project(request.target_project_id)+"/"+request.target_branch %></p>
           </div>
         </div>
     <% end %>
+    <div style="text-align:center;">
+      <div class="pages" style="width:auto; display:inline-block;">
+        <ul  id="homework_pository_ref_pages">
+          <%= pagination_links_full @pages, @count, :per_page_links => false, :remote => true, :flag => true, :is_new => true%>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
+    <div class="cl"></div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb
index 4053e6739..749135a15 100644
--- a/app/views/pull_requests/index.html.erb
+++ b/app/views/pull_requests/index.html.erb
@@ -28,16 +28,6 @@
       <!--</div>-->
       <div id="pull_requests_list">
         <%= render "pull_requests/pull_requests_list" %>
-
-        <div style="text-align:center;">
-          <div class="pages" style="width:auto; display:inline-block;">
-            <ul  id="homework_pository_ref_pages">
-              <%= pagination_links_full @pages, @count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
-            </ul>
-            <div class="cl"></div>
-          </div>
-        </div>
-        <div class="cl"></div>
       </div>
     </div>
     <script>