From 1c0b4e99a846f5a295f5dd634937b74fac2c0a48 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 24 Nov 2016 09:47:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=89=88=E6=9C=AC=E5=BA=93=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=AD=97=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E5=92=8C?= =?UTF-8?q?Pull=20Requests=E9=A1=B5=E9=9D=A2=E7=9A=84tab=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../settings/_new_repositories.html.erb | 2 +- app/views/pull_requests/index.html.erb | 35 +++++++++++++++---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index a531e904a..b5a6ffe57 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -18,7 +18,7 @@
  • - +

    1.长度必须在1到254个字符之间
    2.仅限使用小写字母(a-z)、数字、破折号(-)和下划线(_)
    3.一旦保存,标识无法修改

    diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb index 2e10d6598..f2591b6ea 100644 --- a/app/views/pull_requests/index.html.erb +++ b/app/views/pull_requests/index.html.erb @@ -3,9 +3,18 @@
      -
    • <%= link_to "待处理#{@requests_opened_count}".html_safe, project_pull_requests_path(:type => "1"), :remote => true, :class => "new_roadmap_type_nomal" %>
    • -
    • <%= link_to "已处理#{@requests_merged_count}".html_safe, project_pull_requests_path(:type => "2"), :remote => true, :class => "new_roadmap_type_nomal" %>
    • -
    • <%= link_to "已关闭#{@requests_closed_count}".html_safe, project_pull_requests_path(:type => "3"), :remote => true, :class => "new_roadmap_type_nomal" %>
    • +
    • + <%= link_to "待处理#{@requests_opened_count}".html_safe, + project_pull_requests_path(:type => "1"), :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_1" %> +
    • +
    • + <%= link_to "已处理#{@requests_merged_count}".html_safe, + project_pull_requests_path(:type => "2"), :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_2" %> +
    • +
    • + <%= link_to "已关闭#{@requests_closed_count}".html_safe, + project_pull_requests_path(:type => "3"), :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_3" %> +
    <% if allow_pull_request(@project) && User.current.member_of?(@project) %> <%= link_to "创建Pull Request", new_project_pull_request_path, :class => "btn btn-green fr mr15 mt10" %> @@ -34,11 +43,23 @@ <% else %> <%= render :partial => "projects/no_data" %>