Fixed DB schema

Changed how components are added in objects

5 files changed, 22 insertions, 33 deletions

diff --git a/app/assets/javascripts/boards/components/modal/footer.js.es6 b/app/assets/javascripts/boards/components/modal/footer.js.es6
index 1a147daca7a..566303431f6 100644
--- a/app/assets/javascripts/boards/components/modal/footer.js.es6
+++ b/app/assets/javascripts/boards/components/modal/footer.js.es6
@@ -48,7 +48,7 @@
       },
     },
     components: {
-      'lists-dropdown': gl.issueBoards.ModalFooterListsDropdown,
+      listsDropdown: gl.issueBoards.ModalFooterListsDropdown,
     },
     template: `
       <footer
diff --git a/app/assets/javascripts/boards/components/modal/header.js.es6 b/app/assets/javascripts/boards/components/modal/header.js.es6
index 1b01a597874..f6d891a1633 100644
--- a/app/assets/javascripts/boards/components/modal/header.js.es6
+++ b/app/assets/javascripts/boards/components/modal/header.js.es6
@@ -24,7 +24,7 @@
       },
     },
     components: {
-      'modal-tabs': gl.issueBoards.ModalTabs,
+      modalTabs: gl.issueBoards.ModalTabs,
     },
     template: `
       <div>
diff --git a/app/assets/javascripts/boards/components/modal/index.js.es6 b/app/assets/javascripts/boards/components/modal/index.js.es6
index f7f50455acc..dd40075ac47 100644
--- a/app/assets/javascripts/boards/components/modal/index.js.es6
+++ b/app/assets/javascripts/boards/components/modal/index.js.es6
@@ -70,10 +70,10 @@
       },
     },
     components: {
-      'modal-header': gl.issueBoards.IssuesModalHeader,
-      'modal-list': gl.issueBoards.ModalList,
-      'modal-footer': gl.issueBoards.ModalFooter,
-      'empty-state': gl.issueBoards.ModalEmptyState,
+      modalHeader: gl.issueBoards.IssuesModalHeader,
+      modalList: gl.issueBoards.ModalList,
+      modalFooter: gl.issueBoards.ModalFooter,
+      emptyState: gl.issueBoards.ModalEmptyState,
     },
     template: `
       <div
diff --git a/app/assets/javascripts/boards/components/modal/list.js.es6 b/app/assets/javascripts/boards/components/modal/list.js.es6
index 0df09d42059..309696c7078 100644
--- a/app/assets/javascripts/boards/components/modal/list.js.es6
+++ b/app/assets/javascripts/boards/components/modal/list.js.es6
@@ -94,7 +94,7 @@
       this.destroyMasonry();
     },
     components: {
-      'issue-card-inner': gl.issueBoards.IssueCardInner,
+      issueCardInner: gl.issueBoards.IssueCardInner,
     },
     template: `
       <div
diff --git a/db/schema.rb b/db/schema.rb
index d887b441189..c73c311ccb2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -87,9 +87,9 @@ ActiveRecord::Schema.define(version: 20170130204620) do
     t.boolean "send_user_confirmation_email", default: false
     t.integer "container_registry_token_expire_delay", default: 5
     t.text "after_sign_up_text"
+    t.boolean "user_default_external", default: false, null: false
     t.string "repository_storages", default: "default"
     t.string "enabled_git_access_protocol"
-    t.boolean "user_default_external", default: false, null: false
     t.boolean "domain_blacklist_enabled", default: false
     t.text "domain_blacklist"
     t.boolean "koding_enabled"
@@ -98,14 +98,14 @@ ActiveRecord::Schema.define(version: 20170130204620) do
     t.text "help_page_text_html"
     t.text "shared_runners_text_html"
     t.text "after_sign_up_text_html"
+    t.boolean "sidekiq_throttling_enabled", default: false
+    t.string "sidekiq_throttling_queues"
+    t.decimal "sidekiq_throttling_factor"
     t.boolean "housekeeping_enabled", default: true, null: false
     t.boolean "housekeeping_bitmaps_enabled", default: true, null: false
     t.integer "housekeeping_incremental_repack_period", default: 10, null: false
     t.integer "housekeeping_full_repack_period", default: 50, null: false
     t.integer "housekeeping_gc_period", default: 200, null: false
-    t.boolean "sidekiq_throttling_enabled", default: false
-    t.string "sidekiq_throttling_queues"
-    t.decimal "sidekiq_throttling_factor"
     t.boolean "html_emails_enabled", default: true
     t.string "plantuml_url"
     t.boolean "plantuml_enabled"
@@ -398,22 +398,22 @@ ActiveRecord::Schema.define(version: 20170130204620) do
   add_index "deploy_keys_projects", ["project_id"], name: "index_deploy_keys_projects_on_project_id", using: :btree
 
   create_table "deployments", force: :cascade do |t|
-    t.integer "iid"
-    t.integer "project_id"
-    t.integer "environment_id"
-    t.string "ref"
-    t.boolean "tag"
-    t.string "sha"
+    t.integer "iid", null: false
+    t.integer "project_id", null: false
+    t.integer "environment_id", null: false
+    t.string "ref", null: false
+    t.boolean "tag", null: false
+    t.string "sha", null: false
     t.integer "user_id"
-    t.integer "deployable_id", null: false
-    t.string "deployable_type", null: false
+    t.integer "deployable_id"
+    t.string "deployable_type"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string "on_stop"
   end
 
   add_index "deployments", ["project_id", "environment_id", "iid"], name: "index_deployments_on_project_id_and_environment_id_and_iid", using: :btree
-  add_index "deployments", ["project_id", "iid"], name: "index_deployments_on_project_id_and_iid", using: :btree
+  add_index "deployments", ["project_id", "iid"], name: "index_deployments_on_project_id_and_iid", unique: true, using: :btree
 
   create_table "emails", force: :cascade do |t|
     t.integer "user_id", null: false
@@ -685,8 +685,8 @@ ActiveRecord::Schema.define(version: 20170130204620) do
     t.integer "merge_user_id"
     t.string "merge_commit_sha"
     t.datetime "deleted_at"
-    t.integer "lock_version"
     t.string "in_progress_merge_commit_sha"
+    t.integer "lock_version"
     t.text "title_html"
     t.text "description_html"
     t.integer "time_estimate"
@@ -763,16 +763,6 @@ ActiveRecord::Schema.define(version: 20170130204620) do
   add_index "namespaces", ["path"], name: "index_namespaces_on_path_trigram", using: :gin, opclasses: {"path"=>"gin_trgm_ops"}
   add_index "namespaces", ["type"], name: "index_namespaces_on_type", using: :btree
 
-  create_table "note_templates", force: :cascade do |t|
-    t.integer "user_id"
-    t.string "title"
-    t.text "note"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
-  add_index "note_templates", ["user_id"], name: "index_note_templates_on_user_id", using: :btree
-
   create_table "notes", force: :cascade do |t|
     t.text "note"
     t.string "noteable_type"
@@ -788,7 +778,6 @@ ActiveRecord::Schema.define(version: 20170130204620) do
     t.text "st_diff"
     t.integer "updated_by_id"
     t.string "type"
-    t.string "system_type"
     t.text "position"
     t.text "original_position"
     t.datetime "resolved_at"
@@ -971,7 +960,7 @@ ActiveRecord::Schema.define(version: 20170130204620) do
     t.boolean "has_external_wiki"
     t.boolean "lfs_enabled"
     t.text "description_html"
-    t.boolean "only_allow_merge_if_all_discussions_are_resolved", default: false, null: false
+    t.boolean "only_allow_merge_if_all_discussions_are_resolved"
   end
 
   add_index "projects", ["ci_id"], name: "index_projects_on_ci_id", using: :btree