kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-11-12 15:18:56 +02:00
parent c1c64d985e
commit 4dd5d9c8cc
8 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/projects.css.scss
View file

@ -344,4 +344,12 @@ body.project-page table .commit {
background: #2c5c66;
color:white;
}
&.issue {
background: #D12F19;
color:white;
}
&.commit {
background: #2c5c66;
color:white;
}
}

4
app/models/repository.rb
View file

@ -73,7 +73,7 @@ class Repository
def fresh_commits(n = 10)
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 }
commits.sort! do |x, y|
@ -85,7 +85,7 @@ class Repository
def commits_since(date)
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 }
commits.sort! do |x, y|

2
app/views/dashboard/index.html.haml
View file

@ -27,6 +27,8 @@
%a.project-update{:href => dashboard_feed_path(project, update)}
= image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
%span.update-title
- if update.kind_of?(Grit::Commit)
%span.tag.commit= update.head.name
= dashboard_feed_title(update)
%span.update-author
%strong= update.author_name

2
app/views/layouts/project.html.haml
View file

@ -19,7 +19,7 @@
.git_url_wrapper
%input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
%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 "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

4
app/views/projects/_recent_commits.html.haml
View file

@ -22,7 +22,9 @@
- else
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
.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.author

2
lib/commit_ext.rb
View file

@ -1,4 +1,6 @@
module CommitExt
attr_accessor :head
def safe_message
message.encode("UTF-8",
:invalid => :replace,

1
spec/requests/dashboard_spec.rb
View file

@ -22,6 +22,7 @@ describe "Dashboard" do
it "should have 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.safe_message)
end

9
spec/requests/projects_spec.rb
View file

@ -72,10 +72,13 @@ describe "Projects" do
current_path.should == project_path(@project)
end
it "should beahave like dashboard" do
page.should have_content("History")
it "should beahave like activities page" do
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
describe "GET /projects/team" do