diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb index fe8cfafa2..e09e1f6d3 100644 --- a/app/views/pull_requests/_show.html.erb +++ b/app/views/pull_requests/_show.html.erb @@ -23,7 +23,7 @@ 最近更新:<%= format_time(@request.updated_at) %>

<%= find_gitlab_project(@request.source_project_id)+"/"+@request.source_branch %>合并到<%= find_gitlab_project(@request.target_project_id)+"/"+@request.target_branch %> - +

diff --git a/app/views/repositories/_commit_details.html.erb b/app/views/repositories/_commit_details.html.erb index 07620e48d..420cac846 100644 --- a/app/views/repositories/_commit_details.html.erb +++ b/app/views/repositories/_commit_details.html.erb @@ -12,4 +12,7 @@   <% end %> + <% if params[:action] == "commit_diff" %> +
Commit<%= changeset.id %>
+ <% end %> \ No newline at end of file diff --git a/app/views/repositories/commit_diff.html.erb b/app/views/repositories/commit_diff.html.erb index 7693b385c..913561bc2 100644 --- a/app/views/repositories/commit_diff.html.erb +++ b/app/views/repositories/commit_diff.html.erb @@ -1,16 +1,27 @@
-
- <%= render :partial => "top" %> +
+
+ <%= link_to "返回提交历史".html_safe, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev, :page => 1}, :class => "fl linkBlue2 mt3" %> + +
+
+
+

<%= @commit_details.message %>

+
+ + + + + + +
  • + <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %> +
  • +
    -
    Commit - <%= @commit_details.id %>
    -
  • - <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %> -
  • -
    -
    <%= @commit_details.message %>
    + <% @commit_diff.each do |commit_diff| %> -
    +
    <%= commit_diff.new_path %> diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index b77c5fdbe..37f755c3f 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -399,6 +399,7 @@ tr.open span.expander {background-image: url(/images/bullet_toggle_minus.png);} .showing-changes-info {width:710px; padding:10px; padding-top: 0px; background-color:#ffffff; line-height:2;} .showing-changes-project {padding:10px; border-top:1px solid #dce0e6; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} .showing-changes-row {padding:10px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} +.showing-changes-row-commit {padding:10px; border:1px solid #dbdbdb; background-color:#f1f1f1;border-bottom: none} #changed-files-detail {display:none;} #changed-files-detail li {list-style-type:disc; margin-left:15px;} .showing-changes-detail {width:670px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} @@ -951,6 +952,7 @@ p.pro_new_grey{ line-height: 1.9; } .undis {display:none;} .dis {display:block;} .new_roadmap_listbox{ padding:15px;border-bottom:1px solid #dbdbdb;} +.new_roadmap_listbox_commit{ padding:15px;} .new_roadmap_listtitle a{ color: #333;display:block;max-width:800px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} .new_roadmap_listtitle a:hover{ color:#3498db;} .new_roadmap_list_txt{ color: #666;} @@ -998,7 +1000,7 @@ a.sortdownbtn{background: url(/images/sy/liststyle.png) 0 -12px no-repeat; width a.pullreques_reply_name{ font-weight: bold; color: #333;} .pullreques_reply_txt{ width: 900px;color: #666;} .pullreques_pull_top { width: 100%; height: 40px; line-height: 40px; background: #f4f4f4; border-top:1px solid #e1e1e1;border-bottom:1px solid #e1e1e1;} -a.pullreques_pull_name{display: block; margin-left: 10px;max-width:80px; color:#3b94d6 !important; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} +a.pullreques_pull_name{display: block; margin-left: 5px;max-width:80px; color:#3b94d6 !important; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} .pullreques_pull_list li{ height: 30px; line-height: 30px; } .pullreques_pull_txt{display: block; margin-left: 10px;max-width:740px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} .pullreques_change_list li{height: 40px; line-height: 40px;border-bottom:1px solid #e1e1e1; }