diff --git a/app/views/pull_requests/_form.html.erb b/app/views/pull_requests/_form.html.erb index ff840c800..f2d7c84ff 100644 --- a/app/views/pull_requests/_form.html.erb +++ b/app/views/pull_requests/_form.html.erb @@ -8,12 +8,12 @@
-
源分支
- <%= select_tag :branch, options_for_select(@rev), :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl" %> +
源分支
+ <%= select_tag :branch, options_for_select(@rev), :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>
-
目标分支
- <%= select_tag :branch, options_for_select(@rev), :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl" %> +
目标分支
+ <%= select_tag :branch, options_for_select(@rev), :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>

修改分支

diff --git a/app/views/pull_requests/_pull_request_changes.html.erb b/app/views/pull_requests/_pull_request_changes.html.erb index 84067ffca..b24efee6a 100644 --- a/app/views/pull_requests/_pull_request_changes.html.erb +++ b/app/views/pull_requests/_pull_request_changes.html.erb @@ -1,6 +1,6 @@ <% unless @changes.blank? %> <% @changes.each do |cd| %> -
+
<%= cd['new_path'] %> diff --git a/app/views/pull_requests/show.html.erb b/app/views/pull_requests/show.html.erb index 2564dda77..b7b7b4e54 100644 --- a/app/views/pull_requests/show.html.erb +++ b/app/views/pull_requests/show.html.erb @@ -10,6 +10,10 @@
<%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn" %>
+
+ dev_huang没有新内容可以合并至develop
+

请将新改动提交至源分支或者切换到其它目标分支

+