Skip to content
Snippets Groups Projects
Commit 788de6f1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Better commit show page

parent 7d56a51b
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -1011,23 +1011,37 @@ p.time {
}
 
.issue_box,
.commit_box,
.merge_request_box{
@extend .padded;
@extend .borders;
@extend .prepend-top-20;
@extend .append-bottom-20;
border-width:2px;
 
img { max-width: 100%; }
 
pre {
background: white !important;
code {
background: none !important;
}
}
}
 
.commit_box {
.commit_message {
margin: -20px;
padding: 20px;
margin-top:10px;
border-radius:0;
border:none;
font-size:12px;
background-color:#f5f5f5;
border:none;
border-top:1px solid #eee;
}
}
.highlight_word {
background:#EEDC94;
}
Loading
Loading
Loading
Loading
@@ -32,6 +32,8 @@ class CommitsController < ApplicationController
@note = @project.build_commit_note(@commit)
@comments_allowed = true
@line_notes = project.commit_line_notes(@commit)
@notes_count = @line_notes.count + project.commit_notes(@commit).count
end
 
def compare
Loading
Loading
.commit
= link_to tree_project_ref_path(@project, @commit.id), :class => "btn right small" do
Browse Code »
= image_tag gravatar_icon(@commit.author_email), :class => "avatar"
%code= @commit.id.to_s
%h5
= @commit.author_name
%small= @commit.created_at.stamp("Aug 21, 2011 9:23pm")
- if @commit.author_name != @commit.committer_name or @commit.author_email != @commit.committer_email or @commit.authored_date != @commit.committed_date
&ndash;
%cite committed by
= @commit.committer_name
%small= @commit.committed_date.stamp("Aug 21, 2011 9:23pm")
.commit_box
.commit
.right
- unless @notes_count.zero?
%span.btn.small.disabled.padded= pluralize @notes_count, 'note'
 
%br
%pre.commit_message.prettyprint
= commit_msg_with_link_to_issues(@project, @commit.safe_message)
.clear
%br
= link_to tree_project_ref_path(@project, @commit.id), :class => "btn small" do
Browse Code »
= image_tag gravatar_icon(@commit.author_email), :class => "avatar"
%code= @commit.id.to_s
%h5
= @commit.author_name
%small= @commit.created_at.stamp("Aug 21, 2011 9:23pm")
- if @commit.author_name != @commit.committer_name or @commit.author_email != @commit.committer_email or @commit.authored_date != @commit.committed_date
&ndash;
%cite committed by
= @commit.committer_name
%small= @commit.committed_date.stamp("Aug 21, 2011 9:23pm")
 
%pre.commit_message
= commit_msg_with_link_to_issues(@project, @commit.safe_message)
%br
%p.cgray
Showing #{pluralize(@commit.diffs.count, "changed file")}
= render "commits/diffs", :diffs => @commit.diffs
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment