Commit ccd5df27a06cc804e2bf4b48039d8e40bda572a6
- Date: Wed May 21 20:54:38 +0000 2008
- Committer: Johan Sørensen (johan@johansorensen.com)
- Author: Johan Sørensen (johan@johansorensen.com)
- Commit SHA1: ccd5df27a06cc804e2bf4b48039d8e40bda572a6
- Tree SHA1: 0440cbe2eba25a3cc8bd604d165fd4f64b5605d9
Merge commit 'krawek/maint'
* commit 'krawek/maint':
convert the commit id to string because Comment#sha1 is a string (postgres 8.3 compat)
Commit diff
| | |
| 11 | 11 | @git = @repository.git |
| 12 | 12 | @commit = @git.commit(params[:id]) |
| 13 | 13 | @diffs = @commit.diffs |
| 14 | | @comment_count = @repository.comments.count(:all, :conditions => {:sha1 => @commit.id}) |
| 14 | @comment_count = @repository.comments.count(:all, :conditions => {:sha1 => @commit.id.to_s}) |
| 15 | 15 | respond_to do |format| |
| 16 | 16 | format.html |
| 17 | 17 | # TODO: format.diff { render :content_type => "text/plain" } |
| toggle raw diff |
--- a/app/controllers/commits_controller.rb
+++ b/app/controllers/commits_controller.rb
@@ -11,7 +11,7 @@ class CommitsController < ApplicationController
@git = @repository.git
@commit = @git.commit(params[:id])
@diffs = @commit.diffs
- @comment_count = @repository.comments.count(:all, :conditions => {:sha1 => @commit.id})
+ @comment_count = @repository.comments.count(:all, :conditions => {:sha1 => @commit.id.to_s})
respond_to do |format|
format.html
# TODO: format.diff { render :content_type => "text/plain" } |
