deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix compare crash after decorator refactoring

Browse source
This commit is contained in:
randx 2012-07-25 21:45:53 +03:00
parent 0296121f08
commit 501ca8e6e8
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/commits_controller.rb
View file

@ -52,6 +52,8 @@ class CommitsController < ApplicationController
@commit = result[:commit] @commit = result[:commit]
@diffs = result[:diffs] @diffs = result[:diffs]
@line_notes = [] @line_notes = []
@commits = CommitDecorator.decorate(@commits)
end end
def patch def patch

5
app/views/commits/compare.html.haml
View file

@ -24,8 +24,9 @@
- unless @commits.empty? - unless @commits.empty?
%h4 Commits (#{@commits.count}) %div.ui-box
%ul.unstyled= render @commits %h5.small Commits (#{@commits.count})
%ul.unstyled= render @commits
- unless @diffs.empty? - unless @diffs.empty?
%h4 Diff %h4 Diff