diff --git a/app/views/pull_requests/_form.html.erb b/app/views/pull_requests/_form.html.erb index 5cd684ca2..f6c28488e 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 => "target_branch", :value => "target_branch", :class => "ml30 fontGrey3 fb fl" %> +
目标分支
+ <%= select_tag :branch, options_for_select(@rev), :name => "target_branch", :value => "target_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 8cbbdc081..7f937e3cf 100644 --- a/app/views/pull_requests/show.html.erb +++ b/app/views/pull_requests/show.html.erb @@ -1,2 +1,6 @@ <%= render :partial => "pull_requests/pull_request_container" %> -<%= render :partial => "pull_requests/show" %> \ No newline at end of file +<%= render :partial => "pull_requests/show" %> +
+ dev_huang没有新内容可以合并至develop
+

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

+
\ No newline at end of file