--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -77,7 +77,9 @@ class Repository < ActiveRecord::Base
   
   def create_new_repos_task
     Task.create!(:target_class => self.class.name, 
-      :command => "create_git_repository", :arguments => gitdir)
+      :command => "create_git_repository", 
+      :arguments => gitdir, 
+      :target_id => self.id)
   end
   
   def create_delete_repos_task

--- a/app/models/ssh_key.rb
+++ b/app/models/ssh_key.rb
@@ -34,7 +34,9 @@ class SshKey < ActiveRecord::Base
   
   def create_new_task
     Task.create!(:target_class => self.class.name, 
-      :command => "add_to_authorized_keys", :arguments => self.to_key)
+      :command => "add_to_authorized_keys", 
+      :arguments => self.to_key, 
+      :target_id => self.id)
   end
   
   def create_delete_task

--- a/app/models/task.rb
+++ b/app/models/task.rb
@@ -1,5 +1,4 @@
 class Task < ActiveRecord::Base
-  belongs_to :target, :polymorphic => true
   
   def self.find_all_pending
     find(:all, :conditions => {:performed => false})
@@ -20,6 +19,13 @@ class Task < ActiveRecord::Base
       self.performed = true
       self.performed_at = Time.now
       save!
+      unless target_id.blank?
+        obj = target_class.constantize.find_by_id(target_id)
+        if obj && obj.respond_to?(:ready)
+          obj.ready = true
+          obj.save!
+        end
+      end
     end
   end
   

--- /dev/null
+++ b/db/migrate/017_add_target_id_to_tasks.rb
@@ -0,0 +1,9 @@
+class AddTargetIdToTasks < ActiveRecord::Migration
+  def self.up
+    add_column :tasks, :target_id, :integer
+  end
+
+  def self.down
+    remove_column :tasks, :target_id
+  end
+end

--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 16) do
+ActiveRecord::Schema.define(:version => 17) do
 
   create_table "committerships", :force => true do |t|
     t.integer  "user_id"
@@ -88,6 +88,7 @@ ActiveRecord::Schema.define(:version => 16) do
     t.datetime "performed_at"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "target_id"
   end
 
   add_index "tasks", ["performed"], :name => "index_tasks_on_performed"

--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -133,6 +133,7 @@ describe Repository do
     task = Task.find(:first, :conditions => ["target_class = 'Repository'"], :order => "id desc")
     task.command.should == "create_git_repository"
     task.arguments.should match(/#{@repository.gitdir}$/)
+    task.target_id.should == @repository.id
   end
   
   it "creates a Task on destroy" do

--- a/spec/models/ssh_key_spec.rb
+++ b/spec/models/ssh_key_spec.rb
@@ -85,6 +85,7 @@ describe SshKey do
     task = Task.find(:first, :conditions => ["target_class = 'SshKey'"], :order => "id desc")
     task.command.should == "add_to_authorized_keys"
     task.arguments.should == ssh_key.to_key
+    task.target_id.should == ssh_key.id
   end
   
   it "creates a Task on destroy" do

--- a/spec/models/task_spec.rb
+++ b/spec/models/task_spec.rb
@@ -18,6 +18,17 @@ describe Task do
     @task.performed_at.should_not == nil
   end
   
+  it "marks the object as ready if it has a target_id" do
+    target = repositories(:johans)
+    target.ready = false
+    target.save!
+    @task.target_id = target.id
+    @task.target_class.constantize.should_receive(@task.command) \
+      .with(@task.arguments).and_return(true)
+    @task.perform!
+    target.reload.ready?.should == true
+  end
+  
   it "finds tasks that needs performin'" do
     @task.update_attributes(:performed => true)
     Task.find_all_pending.should == [tasks(:add_key)]