summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/commit.rb4
-rw-r--r--app/views/dashboard/_events_feed.html.haml4
2 files changed, 6 insertions, 2 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 281e3f036e2..a59e880370a 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -56,4 +56,8 @@ class Commit
def prev_commit
parents.first
end
+
+ def prev_commit_id
+ prev_commit.id
+ end
end
diff --git a/app/views/dashboard/_events_feed.html.haml b/app/views/dashboard/_events_feed.html.haml
index ae52fb8002b..e341319503e 100644
--- a/app/views/dashboard/_events_feed.html.haml
+++ b/app/views/dashboard/_events_feed.html.haml
@@ -12,8 +12,8 @@
= time_ago_in_words(event.created_at)
ago.
- if event.commits.count > 1
- = link_to compare_project_commits_path(event.project, :from => event.commits.last, :to => event.commits.first) do
- Compare #{event.commits.last.id[0..8]}...#{event.commits.first.id[0..8]}
+ = link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do
+ Compare #{event.commits.first.commit.id[0..8]}...#{event.commits.last.id[0..8]}
- @project = event.project
%ul.unstyled
= render event.commits