summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-03-05 18:28:32 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2017-03-05 18:53:09 +0100
commit4ac1467c5ce969e082d96e7b2a60ae8e1654c881 (patch)
tree9e9142915fc36144363c7418bd9fe5cdde5621c3 /db
parent91ce04678ea78f2042026e8584e5d1069853dbc4 (diff)
downloadgitlab-ce-4ac1467c5ce969e082d96e7b2a60ae8e1654c881.tar.gz
Update db/schema
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20170217151948_add_owner_id_to_triggers.rb (renamed from db/migrate/20170215164610_add_owner_id_to_triggers.rb)0
-rw-r--r--db/migrate/20170217151949_add_description_to_triggers.rb (renamed from db/migrate/20170215165036_add_description_to_triggers.rb)0
-rw-r--r--db/schema.rb9
3 files changed, 6 insertions, 3 deletions
diff --git a/db/migrate/20170215164610_add_owner_id_to_triggers.rb b/db/migrate/20170217151948_add_owner_id_to_triggers.rb
index 845c89c703e..845c89c703e 100644
--- a/db/migrate/20170215164610_add_owner_id_to_triggers.rb
+++ b/db/migrate/20170217151948_add_owner_id_to_triggers.rb
diff --git a/db/migrate/20170215165036_add_description_to_triggers.rb b/db/migrate/20170217151949_add_description_to_triggers.rb
index 1dca0e37412..1dca0e37412 100644
--- a/db/migrate/20170215165036_add_description_to_triggers.rb
+++ b/db/migrate/20170217151949_add_description_to_triggers.rb
diff --git a/db/schema.rb b/db/schema.rb
index cd5aa339269..75daae86a4a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20170217151947) do
+ActiveRecord::Schema.define(version: 20170217151949) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -111,7 +111,7 @@ ActiveRecord::Schema.define(version: 20170217151947) do
t.boolean "plantuml_enabled"
t.integer "max_pages_size", default: 100, null: false
t.integer "terminal_max_session_time", default: 0, null: false
- t.string "default_artifacts_expire_in", default: '0', null: false
+ t.string "default_artifacts_expire_in", default: "0", null: false
end
create_table "audit_events", force: :cascade do |t|
@@ -377,6 +377,8 @@ ActiveRecord::Schema.define(version: 20170217151947) do
t.datetime "created_at"
t.datetime "updated_at"
t.integer "gl_project_id"
+ t.integer "owner_id"
+ t.string "description"
end
add_index "ci_triggers", ["gl_project_id"], name: "index_ci_triggers_on_gl_project_id", using: :btree
@@ -581,9 +583,9 @@ ActiveRecord::Schema.define(version: 20170217151947) do
end
add_index "labels", ["group_id", "project_id", "title"], name: "index_labels_on_group_id_and_project_id_and_title", unique: true, using: :btree
- add_index "labels", ["type", "project_id"], name: "index_labels_on_type_and_project_id", using: :btree
add_index "labels", ["project_id"], name: "index_labels_on_project_id", using: :btree
add_index "labels", ["title"], name: "index_labels_on_title", using: :btree
+ add_index "labels", ["type", "project_id"], name: "index_labels_on_type_and_project_id", using: :btree
create_table "lfs_objects", force: :cascade do |t|
t.string "oid", null: false
@@ -1333,6 +1335,7 @@ ActiveRecord::Schema.define(version: 20170217151947) do
add_index "web_hooks", ["project_id"], name: "index_web_hooks_on_project_id", using: :btree
add_foreign_key "boards", "projects"
+ add_foreign_key "ci_triggers", "users", column: "owner_id", on_delete: :cascade
add_foreign_key "issue_metrics", "issues", on_delete: :cascade
add_foreign_key "label_priorities", "labels", on_delete: :cascade
add_foreign_key "label_priorities", "projects", on_delete: :cascade