Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-03-31 19:56:26 +0300
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-03-31 21:37:17 +0300
commitb5fce1d5ac87546e8f31fb0ef6f6c4d514670198 (patch)
treeacc3a2ec699bcdc6ebab3c9a82f1816916643658 /db/schema.rb
parent18b445ade4280c03e73ccbf2ca4d175e97a887c8 (diff)
Removed unnecessary table ‘protected_tag_merge_access_levels’
Fixed timestamps on protected_tags
Diffstat (limited to 'db/schema.rb')
-rw-r--r--db/schema.rb22
1 files changed, 9 insertions, 13 deletions
diff --git a/db/schema.rb b/db/schema.rb
index 05b28b6a63b..650b18bb013 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: 20170317203554) do
+ActiveRecord::Schema.define(version: 20170315194013) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -963,28 +963,23 @@ ActiveRecord::Schema.define(version: 20170317203554) do
add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree
- create_table "protected_tag_merge_access_levels", force: :cascade do |t|
- t.integer "protected_tag_id", null: false
- t.integer "access_level", default: 40, null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
- end
-
- add_index "protected_tag_merge_access_levels", ["protected_tag_id"], name: "index_protected_tag_merge_access", using: :btree
-
create_table "protected_tag_push_access_levels", force: :cascade do |t|
t.integer "protected_tag_id", null: false
- t.integer "access_level", default: 40, null: false
+ t.integer "access_level", default: 40
+ t.integer "user_id"
+ t.integer "group_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
add_index "protected_tag_push_access_levels", ["protected_tag_id"], name: "index_protected_tag_push_access", using: :btree
+ add_index "protected_tag_push_access_levels", ["user_id"], name: "index_protected_tag_push_access_levels_on_user_id", using: :btree
create_table "protected_tags", force: :cascade do |t|
t.integer "project_id", null: false
t.string "name", null: false
- t.string "timestamps"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
add_index "protected_tags", ["project_id"], name: "index_protected_tags_on_project_id", using: :btree
@@ -1331,8 +1326,9 @@ ActiveRecord::Schema.define(version: 20170317203554) do
add_foreign_key "project_statistics", "projects", on_delete: :cascade
add_foreign_key "protected_branch_merge_access_levels", "protected_branches"
add_foreign_key "protected_branch_push_access_levels", "protected_branches"
- add_foreign_key "protected_tag_merge_access_levels", "protected_tags"
+ add_foreign_key "protected_tag_push_access_levels", "namespaces", column: "group_id"
add_foreign_key "protected_tag_push_access_levels", "protected_tags"
+ add_foreign_key "protected_tag_push_access_levels", "users"
add_foreign_key "subscriptions", "projects", on_delete: :cascade
add_foreign_key "timelogs", "issues", name: "fk_timelogs_issues_issue_id", on_delete: :cascade
add_foreign_key "timelogs", "merge_requests", name: "fk_timelogs_merge_requests_merge_request_id", on_delete: :cascade