From c20b679c22c79362c3307d53231a55d4e4c11d3d Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 3 Aug 2016 17:04:02 +0800 Subject: [PATCH] =?UTF-8?q?PR=20new=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/pull_requests/_form.html.erb | 2 +- app/views/pull_requests/_new.html.erb | 63 ++----------------- .../_pull_requests_list.html.erb | 2 +- 3 files changed, 7 insertions(+), 60 deletions(-) diff --git a/app/views/pull_requests/_form.html.erb b/app/views/pull_requests/_form.html.erb index 2c3123748..5248325e1 100644 --- a/app/views/pull_requests/_form.html.erb +++ b/app/views/pull_requests/_form.html.erb @@ -1,7 +1,7 @@ <%= form_tag(url_for(:controller => 'pull_requests', :action => 'create', :project_id => @project.id), :id => 'pull_request_form', :method => "post") do %>
标题
-

标题以[WIP]或WIP开头：以防还在进程中的合并请求在它完成之前被合并

+
描述
diff --git a/app/views/pull_requests/_new.html.erb b/app/views/pull_requests/_new.html.erb index 8b2b31964..6ca978ed5 100644 --- a/app/views/pull_requests/_new.html.erb +++ b/app/views/pull_requests/_new.html.erb @@ -6,66 +6,13 @@
新的合并请求
-
- 从 dev_huang 合并至 master修改分支 -
-
-
-<%= render :partial => "pull_requests/form" %> - -
根据最近提交时间排列
-
-
- 2016-08-02 -

1次提交

-
-
- 第一次提交 -

黄井泉创建于24小时前

-
- - - + + + -
-
-
-
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">
-
+<%= render :partial => "pull_requests/form" %> +