diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index dddfda159..a0be304a3 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -48,7 +48,7 @@ class PullRequestsController < ApplicationController end def show - @request = @g.merge_request(@rpoject.gpid, id) + #@request = @g.merge_request(@rpoject.gpid, id) end # Accept 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 index e69de29bb..451be228f 100644 --- a/app/views/pull_requests/_pull_request_container.html.erb +++ b/app/views/pull_requests/_pull_request_container.html.erb @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/app/views/pull_requests/new.html.erb b/app/views/pull_requests/new.html.erb index 8df8982b3..3d3f9af61 100644 --- a/app/views/pull_requests/new.html.erb +++ b/app/views/pull_requests/new.html.erb @@ -1,2 +1,83 @@ -<%= render :partial => "pull_requests/new" %> +<%= render :partial => "pull_requests/pull_request_container" %> +
+
新的合并请求
+
+ 从 dev_huang 合并至 master修改分支 +
+
+
+<%= render :partial => "pull_requests/form" %> + +
根据最近提交时间排列
+
+
+ 2016-08-02 +

1次提交

+
+
+ 第一次提交 +

黄井泉创建于24小时前

+
+
+ 5202e2ef +

浏览文件

+
+
+
+
+
Showing 3 changed files with 3 additions and 3 deletions +
    +
  1. app/views/organizations/_org_course_homework.html.erb
    2. +
  2. app/views/users/_course_homework.html.erb
    3. +
  3. app/views/users/_user_homework_detail.html.erb
    4. +
+
+
app/views/organizations/_org_course_homework.html.erb
+
+ + + + + + + + + + + + + + + + + + + + + +
9999<% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
100100<div class="mt10">
111- <div class="fl mr5 fontGrey3">
111+ <div class="fl mr20 fontGrey3 w80">
+
+
+ \ No newline at end of file diff --git a/app/views/pull_requests/show.html.erb b/app/views/pull_requests/show.html.erb index e69de29bb..42c863fd0 100644 --- a/app/views/pull_requests/show.html.erb +++ b/app/views/pull_requests/show.html.erb @@ -0,0 +1,87 @@ +<%= render :partial => "pull_requests/pull_request_container" %> +
+ 待处理合并请求 #1 · 由黄井泉于2小时前提交 · 最后编辑时间1小时前 + 编辑 +
+
+
请合并我的代码

Pull Request

+
+ 请求将 rep_quality 合并至 develop +
+ 接受请求 +
+
+ +
根据最近提交时间排列
+
+
+ 2016-08-02 +

1次提交

+
+
+ 第一次提交 +

黄井泉创建于24小时前

+
+
+ 5202e2ef +

浏览文件

+
+
+
+
+
Showing 3 changed files with 3 additions and 3 deletions +
    +
  1. app/views/organizations/_org_course_homework.html.erb
    2. +
  2. app/views/users/_course_homework.html.erb
    3. +
  3. app/views/users/_user_homework_detail.html.erb
    4. +
+
+
app/views/organizations/_org_course_homework.html.erb
+
+ + + + + + + + + + + + + + + + + + + + + +
9999<% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
100100<div class="mt10">
111- <div class="fl mr5 fontGrey3">
111+ <div class="fl mr20 fontGrey3 w80">
+
+
+ + \ No newline at end of file diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index cca2cde83..4c4019593 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -537,4 +537,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;} .merge-record .active {border-bottom:2px solid #3b94d6;} .merge-commit-time {width:200px; float:left;} .merge-commit-detail {width:380px; float:left;} -.merge-commit-code {width:150px; float:left; text-align:right;} \ No newline at end of file +.merge-commit-code {width:150px; float:left; text-align:right;} +.merge-show {margin:-10px -10px 0 -10px; padding:10px; line-height:36px; border-bottom:1px solid #ddd;} +.open-status {color:#fff; padding:0 16px; background-color:#3b94d6; border-radius:2px; display:inline-block;} +.merge-commit-option {padding:12px; border:1px solid #ddd; background-color:#f9f9f9; border-radius:2px;} \ No newline at end of file