summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-08-04 11:29:39 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-08-04 11:29:39 +0000
commite0953d18c9e1a4b0c792c81c208108bf62293cfc (patch)
tree8410a8d6f379c6140be58d8f5dbf9e41900e8a34
parentfbae59cd5559879f910f2046835b61bec2f42a69 (diff)
parentefef0be2352a7a2ca769c1db0560a76fbe36b9a3 (diff)
downloadgitlab-ce-e0953d18c9e1a4b0c792c81c208108bf62293cfc.tar.gz
Merge branch '20491-remove-unnecessary-index_projects_on_builds_enabled-index-from-the-projects-table' into 'master'
Remove unnecessary index_projects_on_builds_enabled index from the projects table See merge request !5611
-rw-r--r--CHANGELOG1
-rw-r--r--db/migrate/20160802010328_remove_builds_enable_index_on_projects.rb9
-rw-r--r--db/schema.rb3
3 files changed, 11 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b2002c71258..886b7865e5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -46,6 +46,7 @@ v 8.11.0 (unreleased)
- Make branches sortable without push permission !5462 (winniehell)
- Check for Ci::Build artifacts at database level on pipeline partial
- Convert image diff background image to CSS (ClemMakesApps)
+ - Remove unnecessary index_projects_on_builds_enabled index from the projects table
- Make "New issue" button in Issue page less obtrusive !5457 (winniehell)
- Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration
- Fix search for notes which belongs to deleted objects
diff --git a/db/migrate/20160802010328_remove_builds_enable_index_on_projects.rb b/db/migrate/20160802010328_remove_builds_enable_index_on_projects.rb
new file mode 100644
index 00000000000..5fd51cb65f1
--- /dev/null
+++ b/db/migrate/20160802010328_remove_builds_enable_index_on_projects.rb
@@ -0,0 +1,9 @@
+class RemoveBuildsEnableIndexOnProjects < ActiveRecord::Migration
+ include Gitlab::Database::MigrationHelpers
+
+ DOWNTIME = false
+
+ def change
+ remove_index :projects, column: :builds_enabled if index_exists?(:projects, :builds_enabled)
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5b35a528e71..dc28842758a 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: 20160726093600) do
+ActiveRecord::Schema.define(version: 20160802010328) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -852,7 +852,6 @@ ActiveRecord::Schema.define(version: 20160726093600) do
end
add_index "projects", ["builds_enabled", "shared_runners_enabled"], name: "index_projects_on_builds_enabled_and_shared_runners_enabled", using: :btree
- add_index "projects", ["builds_enabled"], name: "index_projects_on_builds_enabled", using: :btree
add_index "projects", ["ci_id"], name: "index_projects_on_ci_id", using: :btree
add_index "projects", ["created_at", "id"], name: "index_projects_on_created_at_and_id", using: :btree
add_index "projects", ["creator_id"], name: "index_projects_on_creator_id", using: :btree