diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-07-25 21:45:53 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-07-25 21:45:53 +0300 |
| commit | 501ca8e6e83c221487ccc03da906ccda385831c8 (patch) | |
| tree | ccc650dc4a8472f96e25faad30f29c8d4cff81b0 | |
| parent | 0296121f08cd960f5a96686b3bedd75f5651765a (diff) | |
| download | gitlab-ce-501ca8e6e83c221487ccc03da906ccda385831c8.tar.gz | |
Fix compare crash after decorator refactoring
| -rw-r--r-- | app/controllers/commits_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/commits/compare.html.haml | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb index a8540569462..05f29da3ddd 100644 --- a/app/controllers/commits_controller.rb +++ b/app/controllers/commits_controller.rb @@ -52,6 +52,8 @@ class CommitsController < ApplicationController @commit = result[:commit] @diffs = result[:diffs] @line_notes = [] + + @commits = CommitDecorator.decorate(@commits) end def patch diff --git a/app/views/commits/compare.html.haml b/app/views/commits/compare.html.haml index 66ed8dad595..04d8af5459d 100644 --- a/app/views/commits/compare.html.haml +++ b/app/views/commits/compare.html.haml @@ -24,8 +24,9 @@ - unless @commits.empty? - %h4 Commits (#{@commits.count}) - %ul.unstyled= render @commits + %div.ui-box + %h5.small Commits (#{@commits.count}) + %ul.unstyled= render @commits - unless @diffs.empty? %h4 Diff |