From da0c2fd90d99340495abcaf84d4e23f8f6d6fdc7 Mon Sep 17 00:00:00 2001
From: Ian Ownbey <ian@inspir.es>
Date: Mon, 27 Oct 2008 02:48:45 -0700
Subject: [PATCH] Fixed branch settings issue

---
 app/models/code_comment.rb | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/models/code_comment.rb b/app/models/code_comment.rb
index 108841a..62706da 100644
--- a/app/models/code_comment.rb
+++ b/app/models/code_comment.rb
@@ -19,7 +19,7 @@ class AlreadyExported < ArgumentError; end
   belongs_to :owner, :polymorphic => true
   belongs_to :user
   belongs_to :code_file
-  has_many :versions, :dependent => :delete_all
+  has_many :versions, :dependent => :delete_all, :class_name => 'CommentVersion'
   
   before_update :create_version
   after_update :add_export_to_queue
@@ -48,7 +48,7 @@ def exported_body=(comment)
   # Before update, creating the previous version
   def create_version
     if self.body_changed? && !@dont_version
-      Version.create(
+      CommentVersion.create(
         :user_id => (self.user_id_changed? ? self.user_id_was : self.user_id), 
         :body => self.body_was, 
         :exported => self.exported?, 
@@ -99,13 +99,6 @@ def export! version_number
       puts version.body
       begin
         commit = export(pre_version, version)
-      rescue
-        Error.create({
-            :pre_version => pre_version, 
-            :version => version,
-            :type => $!.class,
-            :message => $!.message
-        })
       else
         self.without_versioning do
           version.exported = true
@@ -174,7 +167,7 @@ def export v1, v2
     @file.close
     
     git = Git.open(RAILS_ROOT + '/code')
-    git.branch(Setting[:git_branch]).checkout
+    git.branch(Setting[:branch]).checkout
     git.config('user.name', v2.user.try(:login) || 'Docbox')
     git.config('user.email', v2.user.try(:email) || 'docbox@docbox.org')
     commit = git.commit_all("Documentation update for #{owner.name}")