From 01d159b409d8b24d36204979a73de249843d71bf Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 23 Mar 2017 14:00:41 +0100
Subject: Rename container image model to container repository

---
 db/migrate/20170322013926_create_container_image.rb      | 13 -------------
 db/migrate/20170322013926_create_container_repository.rb | 12 ++++++++++++
 db/schema.rb                                             | 10 ++++------
 3 files changed, 16 insertions(+), 19 deletions(-)
 delete mode 100644 db/migrate/20170322013926_create_container_image.rb
 create mode 100644 db/migrate/20170322013926_create_container_repository.rb

(limited to 'db')

diff --git a/db/migrate/20170322013926_create_container_image.rb b/db/migrate/20170322013926_create_container_image.rb
deleted file mode 100644
index c494f2a56c7..00000000000
--- a/db/migrate/20170322013926_create_container_image.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateContainerImage < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-
-  def change
-    create_table :container_images do |t|
-      t.integer :project_id
-      t.string :name
-      t.string :path
-    end
-  end
-end
diff --git a/db/migrate/20170322013926_create_container_repository.rb b/db/migrate/20170322013926_create_container_repository.rb
new file mode 100644
index 00000000000..0235fd7e096
--- /dev/null
+++ b/db/migrate/20170322013926_create_container_repository.rb
@@ -0,0 +1,12 @@
+class CreateContainerRepository < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    create_table :container_repositories do |t|
+      t.integer :project_id
+      t.string :path
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b5bd6fc3121..be7604a14d5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -61,7 +61,6 @@ ActiveRecord::Schema.define(version: 20170322013926) do
     t.boolean "shared_runners_enabled", default: true, null: false
     t.integer "max_artifacts_size", default: 100, null: false
     t.string "runners_registration_token"
-    t.integer "max_pages_size", default: 100, null: false
     t.boolean "require_two_factor_authentication", default: false
     t.integer "two_factor_grace_period", default: 48
     t.boolean "metrics_enabled", default: false
@@ -111,6 +110,7 @@ ActiveRecord::Schema.define(version: 20170322013926) do
     t.string "plantuml_url"
     t.boolean "plantuml_enabled"
     t.integer "terminal_max_session_time", default: 0, null: false
+    t.integer "max_pages_size", default: 100, null: false
     t.string "default_artifacts_expire_in", default: "0", null: false
     t.integer "unique_ips_limit_per_user"
     t.integer "unique_ips_limit_time_window"
@@ -322,9 +322,8 @@ ActiveRecord::Schema.define(version: 20170322013926) do
 
   add_index "ci_variables", ["project_id"], name: "index_ci_variables_on_project_id", using: :btree
 
-  create_table "container_images", force: :cascade do |t|
+  create_table "container_repositories", force: :cascade do |t|
     t.integer "project_id"
-    t.string "name"
     t.string "path"
   end
 
@@ -694,8 +693,8 @@ ActiveRecord::Schema.define(version: 20170322013926) do
     t.integer "visibility_level", default: 20, null: false
     t.boolean "request_access_enabled", default: false, null: false
     t.datetime "deleted_at"
-    t.text "description_html"
     t.boolean "lfs_enabled"
+    t.text "description_html"
     t.integer "parent_id"
   end
 
@@ -991,7 +990,6 @@ ActiveRecord::Schema.define(version: 20170322013926) do
   end
 
   add_index "routes", ["path"], name: "index_routes_on_path", unique: true, using: :btree
-  add_index "routes", ["path"], name: "index_routes_on_path_text_pattern_ops", using: :btree, opclasses: {"path"=>"varchar_pattern_ops"}
   add_index "routes", ["source_type", "source_id"], name: "index_routes_on_source_type_and_source_id", unique: true, using: :btree
 
   create_table "sent_notifications", force: :cascade do |t|
@@ -1238,8 +1236,8 @@ ActiveRecord::Schema.define(version: 20170322013926) do
     t.datetime "otp_grace_period_started_at"
     t.boolean "ldap_email", default: false, null: false
     t.boolean "external", default: false
-    t.string "incoming_email_token"
     t.string "organization"
+    t.string "incoming_email_token"
     t.boolean "authorized_projects_populated"
     t.boolean "ghost"
   end
-- 
cgit v1.2.3