Download as
Browse Code »

Commit 1924de91c58a429452edd97b181520abd9968bf7

Authored by Dmitriy Zaporozhets
1 parent f6f939ee
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fixed compare for push

Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
app/models/commit.rb
  Diff comments   View file @1924de9
... ... @@ -56,4 +56,8 @@ class Commit
56 56 def prev_commit
57 57 parents.first
58 58 end
  59 +
  60 + def prev_commit_id
  61 + prev_commit.id
  62 + end
59 63 end
... ...
app/views/dashboard/_events_feed.html.haml
  Diff comments   View file @1924de9
... ... @@ -12,8 +12,8 @@
12 12 = time_ago_in_words(event.created_at)
13 13 ago.
14 14 - if event.commits.count > 1
15   - = link_to compare_project_commits_path(event.project, :from => event.commits.last, :to => event.commits.first) do
16   - Compare #{event.commits.last.id[0..8]}...#{event.commits.first.id[0..8]}
  15 + = link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do
  16 + Compare #{event.commits.first.commit.id[0..8]}...#{event.commits.last.id[0..8]}
17 17 - @project = event.project
18 18 %ul.unstyled
19 19 = render event.commits
... ...