diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index f44e2bc27..5f70e5771 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -9,7 +9,8 @@ class PullRequestsController < ApplicationController
end
def new
-
+ # id = params[:]
+ @request = @g.merge_request(@rpoject.gpid, id)
end
# Creates a merge request.
diff --git a/app/views/pull_requests/_pull_request_container.html.erb b/app/views/pull_requests/_pull_request_container.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb
index e8147f97d..c807f758b 100644
--- a/app/views/pull_requests/index.html.erb
+++ b/app/views/pull_requests/index.html.erb
@@ -1,3 +1,4 @@
+<%= render "pull_request_container" %>
- -
- 第三次提交
0关闭
-
- #5 · Administrator 创建于3小时前3小时前更新
-
-
- -
- 第二次提交0合并
-
- #5 · Administrator 创建于3小时前3小时前更新
-
-
- -
- 第一次提交0打开
-
- #5 · Administrator 创建于3小时前3小时前更新
-
-
+ <% if @requests.nil? %>
+ 没有可显示的请求
+ <% else %>
+ <% @requests.each do |request| %>
+ -
+ <% request %>
+ <%=link_to request.title, project_pull_request_path(request.id, :project_id => @project.id), :class => "linkGrey3 fb fl"%>
+
+
+ #5 · <%= link_to request.author.try(:username), user_path(request.author), :class => "link-blue" %> 创建于<%= time_tag(request.created_at) %>
+ <%= time_tag(request.updated_at) %>更新
+
+
+ <% end %>
+ <% end %>
-没有可显示的请求