summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-11-11 16:19:06 +0100
committerDouwe Maan <douwe@gitlab.com>2015-11-18 12:00:48 +0100
commit531177757eef772cc7ce5dd3898c3e6803187ed6 (patch)
treea813aff34db3fad52da330517978fb8777f301e2 /db
parent21a59b23fe4d8bc4331f746c75f9242a49d75faa (diff)
downloadgitlab-ce-531177757eef772cc7ce5dd3898c3e6803187ed6.tar.gz
Add import_error to project.
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20151110125604_add_import_error_to_project.rb5
-rw-r--r--db/schema.rb5
2 files changed, 9 insertions, 1 deletions
diff --git a/db/migrate/20151110125604_add_import_error_to_project.rb b/db/migrate/20151110125604_add_import_error_to_project.rb
new file mode 100644
index 00000000000..7fc990f8d0a
--- /dev/null
+++ b/db/migrate/20151110125604_add_import_error_to_project.rb
@@ -0,0 +1,5 @@
+class AddImportErrorToProject < ActiveRecord::Migration
+ def change
+ add_column :projects, :import_error, :text
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index aa76cef9fe4..440a33e2006 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -640,7 +640,10 @@ ActiveRecord::Schema.define(version: 20151116144118) do
t.integer "star_count", default: 0, null: false
t.string "import_type"
t.string "import_source"
- t.integer "commit_count", default: 0
+ t.integer "commit_count", default: 0
+ t.boolean "merge_requests_ff_only_enabled", default: false
+ t.text "issues_template"
+ t.text "import_error"
end
add_index "projects", ["created_at", "id"], name: "index_projects_on_created_at_and_id", using: :btree