Commit 70efc014 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'project_activities'

parents 378ff10c 97ba7315
......@@ -675,14 +675,14 @@ body.project-page h2.icon.loading {
a.project-update.titled {
position: relative;
padding-right: 310px !important;
padding-left: 235px !important;
.right-block {
.title-block {
padding: 10px;
width: 280px;
width: 205px;
background: #f5f5f5;
position: absolute;
right: 0;
left: 0;
top: 0;
}
}
......@@ -45,6 +45,14 @@ class Note < ActiveRecord::Base
def notify_author
@notify_author ||= false
end
def target
if noteable_type == "Commit"
project.commit(noteable_id)
else
noteable
end
end
end
# == Schema Information
#
......
......@@ -117,9 +117,9 @@ class Repository
commits.sort! do |x, y|
y.committed_date <=> x.committed_date
end[0..n]
end
commits
commits[0..n]
end
def commits_since(date)
......
%a.project-update{:href => dashboard_feed_path(project, update)}
= image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
%span.update-title
= dashboard_feed_title(update)
%span.update-author
%strong= update.author_name
authored
= time_ago_in_words(update.created_at)
ago
.right
- klass = update.class.to_s.split("::").last.downcase
%span.tag{ :class => klass }= klass
- if update.kind_of?(Commit)
%span.tag.commit= update.head.name
- if update.kind_of?(Note)
%a.project-update.titled{:href => dashboard_feed_path(project, update)}
= image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
%span.update-title
= dashboard_feed_title(update)
%span.update-author
%strong= update.author_name
= time_ago_in_words(update.created_at)
ago
- noteable = update.target
- if noteable.kind_of?(MergeRequest)
.title-block
%span.update-title
%span.commit.tag
Merge Request #
= noteable.id
%span.update-author
%span= noteable.source_branch
&rarr;
%span= noteable.target_branch
- elsif noteable.kind_of?(Issue)
.title-block
%span.update-title
%span.commit.tag
Issue #
= noteable.id
%span.update-author
.left= truncate noteable.title
- elsif noteable.kind_of?(Commit)
.title-block
%span.update-title
%span.commit.tag
commit
%span.update-author
.left= truncate noteable.id
- else
.title-block
%span.update-title
%span.commit.tag
Project Wall
%span.update-author
\...
- elsif update.kind_of?(MergeRequest)
%a.project-update.titled{:href => project_merge_request_path(project, update)}
= image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
%span.update-title
Opened merge request
%span.update-author
%strong= update.author_name
= time_ago_in_words(update.created_at)
ago
.title-block
%span.update-title
%span.commit.tag
Merge Request #
= update.id
%span.update-author
%span= update.source_branch
&rarr;
%span= update.target_branch
- elsif update.kind_of?(Issue)
%a.project-update.titled{:href => dashboard_feed_path(project, update)}
= image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
%span.update-title
Created new Issue
%span.update-author
%strong= update.author_name
= time_ago_in_words(update.created_at)
ago
.title-block
%span.update-title
%span.commit.tag
Issue #
= update.id
%span.update-author
.left= truncate update.title
......@@ -13,9 +13,9 @@
authored
= time_ago_in_words(update.created_at)
ago
.right-block
.title-block
%span.update-title
%span.commit.tag= update.head.name
%span.update-author
.right= truncate update.commit.id
.left= truncate update.commit.id
......@@ -78,13 +78,14 @@ describe "Projects" do
current_path.should == project_path(@project)
end
it "should beahave like activities page" do
within ".project-update" do
page.should have_content("master")
page.should have_content(@project.commit.author.name)
page.should have_content(@project.commit.safe_message)
end
end
# TODO: replace with real one
#it "should beahave like activities page" do
#within ".project-update" 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
......
......@@ -28,7 +28,7 @@ describe "Repository" do
end
it "should show commits list" do
page.all(:css, ".project-update").size.should == 20
page.all(:css, ".project-update").size.should == @project.repo.branches.size
end
end
......
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