summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20130909132950_add_description_to_merge_request.rb5
-rw-r--r--db/schema.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/db/migrate/20130909132950_add_description_to_merge_request.rb b/db/migrate/20130909132950_add_description_to_merge_request.rb
new file mode 100644
index 00000000000..9bcd0c7ee06
--- /dev/null
+++ b/db/migrate/20130909132950_add_description_to_merge_request.rb
@@ -0,0 +1,5 @@
+class AddDescriptionToMergeRequest < ActiveRecord::Migration
+ def change
+ add_column :merge_requests, :description, :text, null: true
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 654f2b1e8f7..d5effe40ea1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20130821090531) do
+ActiveRecord::Schema.define(:version => 20130909132950) do
create_table "deploy_keys_projects", :force => true do |t|
t.integer "deploy_key_id", :null => false
@@ -100,6 +100,7 @@ ActiveRecord::Schema.define(:version => 20130821090531) do
t.string "merge_status"
t.integer "target_project_id", :null => false
t.integer "iid"
+ t.text "description"
end
add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"