Commit 4dd5d9c8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Issue #185 – Show branch name for commits on activities & dashboard pages

parent c1c64d98
...@@ -344,4 +344,12 @@ body.project-page table .commit { ...@@ -344,4 +344,12 @@ body.project-page table .commit {
background: #2c5c66; background: #2c5c66;
color:white; color:white;
} }
&.issue {
background: #D12F19;
color:white;
}
&.commit {
background: #2c5c66;
color:white;
}
} }
...@@ -73,7 +73,7 @@ class Repository ...@@ -73,7 +73,7 @@ class Repository
def fresh_commits(n = 10) def fresh_commits(n = 10)
commits = heads.map do |h| commits = heads.map do |h|
repo.commits(h.name, n) repo.commits(h.name, n).each { |c| c.head = h }
end.flatten.uniq { |c| c.id } end.flatten.uniq { |c| c.id }
commits.sort! do |x, y| commits.sort! do |x, y|
...@@ -85,7 +85,7 @@ class Repository ...@@ -85,7 +85,7 @@ class Repository
def commits_since(date) def commits_since(date)
commits = heads.map do |h| commits = heads.map do |h|
repo.log(h.name, nil, :since => date) repo.log(h.name, nil, :since => date).each { |c| c.head = h }
end.flatten.uniq { |c| c.id } end.flatten.uniq { |c| c.id }
commits.sort! do |x, y| commits.sort! do |x, y|
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
%a.project-update{:href => dashboard_feed_path(project, update)} %a.project-update{:href => dashboard_feed_path(project, update)}
= image_tag gravatar_icon(update.author_email), :class => "left", :width => 40 = image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
%span.update-title %span.update-title
- if update.kind_of?(Grit::Commit)
%span.tag.commit= update.head.name
= dashboard_feed_title(update) = dashboard_feed_title(update)
%span.update-author %span.update-author
%strong= update.author_name %strong= update.author_name
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
.git_url_wrapper .git_url_wrapper
%input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"} %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
%aside %aside
= link_to "History", project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil = link_to "Activities", project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
= link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil = link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil
= link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
= link_to team_project_path(@project), :class => (current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members") ? "current" : nil do = link_to team_project_path(@project), :class => (current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members") ? "current" : nil do
......
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
- else - else
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;" = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
.title .title
%p= link_to truncate(commit.safe_message, :length => 40), project_commit_path(@project, :id => commit.id) %p
%span.tag.commit= commit.head.name
= link_to truncate(commit.safe_message, :length => 40), project_commit_path(@project, :id => commit.id)
%span %span
%span.author %span.author
......
module CommitExt module CommitExt
attr_accessor :head
def safe_message def safe_message
message.encode("UTF-8", message.encode("UTF-8",
:invalid => :replace, :invalid => :replace,
......
...@@ -22,6 +22,7 @@ describe "Dashboard" do ...@@ -22,6 +22,7 @@ describe "Dashboard" do
it "should have news feed" do it "should have news feed" do
within "#news-feed" do within "#news-feed" do
page.should have_content("master")
page.should have_content(@project.commit.author.name) page.should have_content(@project.commit.author.name)
page.should have_content(@project.commit.safe_message) page.should have_content(@project.commit.safe_message)
end end
......
...@@ -72,10 +72,13 @@ describe "Projects" do ...@@ -72,10 +72,13 @@ describe "Projects" do
current_path.should == project_path(@project) current_path.should == project_path(@project)
end end
it "should beahave like dashboard" do it "should beahave like activities page" do
page.should have_content("History") within ".commit" do
page.should have_content("master")
page.should have_content(@project.commit.author.name)
page.should have_content(@project.commit.safe_message)
end
end end
end end
describe "GET /projects/team" do describe "GET /projects/team" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment