summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-04-04 03:37:22 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-04-04 03:38:58 +0100
commit07d7d8e65905a39164b63f55eccdcea8f10f5d14 (patch)
tree4fc627e0256a787ab80f4483b3d6e2442c26a619 /db
parentf9e849c076efb3162a3d951d8aae2e7be3e574f4 (diff)
downloadgitlab-ce-07d7d8e65905a39164b63f55eccdcea8f10f5d14.tar.gz
Renamed ProtectedTag push_access_levels to create_access_levels
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20170309173138_create_protected_tags.rb8
-rw-r--r--db/schema.rb12
2 files changed, 10 insertions, 10 deletions
diff --git a/db/migrate/20170309173138_create_protected_tags.rb b/db/migrate/20170309173138_create_protected_tags.rb
index 00794529143..538f28479c7 100644
--- a/db/migrate/20170309173138_create_protected_tags.rb
+++ b/db/migrate/20170309173138_create_protected_tags.rb
@@ -15,14 +15,14 @@ class CreateProtectedTags < ActiveRecord::Migration
add_index :protected_tags, :project_id
- create_table :protected_tag_push_access_levels do |t|
- t.references :protected_tag, index: { name: "index_protected_tag_push_access" }, foreign_key: true, null: false
+ create_table :protected_tag_create_access_levels do |t|
+ t.references :protected_tag, index: { name: "index_protected_tag_create_access" }, foreign_key: true, null: false
t.integer :access_level, default: GITLAB_ACCESS_MASTER, null: true
t.references :user, foreign_key: true, index: true
- t.integer :group_id#TODO: Should this have an index? Doesn't appear in brances #, index: true
+ t.integer :group_id
t.timestamps null: false
end
- add_foreign_key :protected_tag_push_access_levels, :namespaces, column: :group_id # rubocop: disable Migration/AddConcurrentForeignKey
+ add_foreign_key :protected_tag_create_access_levels, :namespaces, column: :group_id # rubocop: disable Migration/AddConcurrentForeignKey
end
end
diff --git a/db/schema.rb b/db/schema.rb
index 650b18bb013..2a070583834 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -963,7 +963,7 @@ ActiveRecord::Schema.define(version: 20170315194013) do
add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree
- create_table "protected_tag_push_access_levels", force: :cascade do |t|
+ create_table "protected_tag_create_access_levels", force: :cascade do |t|
t.integer "protected_tag_id", null: false
t.integer "access_level", default: 40
t.integer "user_id"
@@ -972,8 +972,8 @@ ActiveRecord::Schema.define(version: 20170315194013) do
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
+ add_index "protected_tag_create_access_levels", ["protected_tag_id"], name: "index_protected_tag_create_access", using: :btree
+ add_index "protected_tag_create_access_levels", ["user_id"], name: "index_protected_tag_create_access_levels_on_user_id", using: :btree
create_table "protected_tags", force: :cascade do |t|
t.integer "project_id", null: false
@@ -1326,9 +1326,9 @@ ActiveRecord::Schema.define(version: 20170315194013) 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_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 "protected_tag_create_access_levels", "namespaces", column: "group_id"
+ add_foreign_key "protected_tag_create_access_levels", "protected_tags"
+ add_foreign_key "protected_tag_create_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