Merge branch 'development' of github.com:icl/cove into development

db/migrate/20110609235208_add_description_to_tags.rb

@@ -0,0 +1,9 @@
+class AddDescriptionToTags < ActiveRecord::Migration
+  def self.up
+    add_column :tags, :description, :string
+  end
+
+  def self.down
+    remove_column :tags, :description
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110602013042) do
+ActiveRecord::Schema.define(:version => 20110609235208) do
 
   create_table "certification_tests", :force => true do |t|
     t.integer  "certification_video_id"
@@ -93,6 +93,7 @@
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "description"
   end
 
   create_table "training_tags", :force => true do |t|

spec/factories/tag_factories.rb

@@ -1,5 +1,6 @@
 Factory.define :tag, :class => Tag do |f|
 	f.name "Riffing"
+	f.description "Description goes here"
 end
 
 Factory.define :tagging, :class => VideoTag do |f|