summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-02-28 21:09:34 +0100
committerKamil Trzciński <ayufan@ayufan.eu>2018-02-28 21:09:34 +0100
commit8af23def1d6450420d06b8de54d23311a978de20 (patch)
tree5da743be888022a197e2555bbcd12076a9ca3633 /db
parent54a575f1bbba44573ab92dc58a4242f1ee734c5d (diff)
downloadgitlab-ce-8af23def1d6450420d06b8de54d23311a978de20.tar.gz
Revert "Merge branch '3867-port-to-ce' into 'master'"
This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8.
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20180119135717_add_uploader_index_to_uploads.rb20
-rw-r--r--db/schema.rb2
2 files changed, 1 insertions, 21 deletions
diff --git a/db/migrate/20180119135717_add_uploader_index_to_uploads.rb b/db/migrate/20180119135717_add_uploader_index_to_uploads.rb
deleted file mode 100644
index a678c3d049f..00000000000
--- a/db/migrate/20180119135717_add_uploader_index_to_uploads.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
-class AddUploaderIndexToUploads < ActiveRecord::Migration
- include Gitlab::Database::MigrationHelpers
-
- DOWNTIME = false
-
- disable_ddl_transaction!
-
- def up
- remove_concurrent_index :uploads, :path
- add_concurrent_index :uploads, [:uploader, :path], using: :btree
- end
-
- def down
- remove_concurrent_index :uploads, [:uploader, :path]
- add_concurrent_index :uploads, :path, using: :btree
- end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 01a2df13dd3..0d97b6f9ddd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1755,7 +1755,7 @@ ActiveRecord::Schema.define(version: 20180201145907) do
add_index "uploads", ["checksum"], name: "index_uploads_on_checksum", using: :btree
add_index "uploads", ["model_id", "model_type"], name: "index_uploads_on_model_id_and_model_type", using: :btree
- add_index "uploads", ["uploader", "path"], name: "index_uploads_on_uploader_and_path", using: :btree
+ add_index "uploads", ["path"], name: "index_uploads_on_path", using: :btree
create_table "user_agent_details", force: :cascade do |t|
t.string "user_agent", null: false