From 38dbdc83071eda22b7d8427e0a0492c24d9bc88c Mon Sep 17 00:00:00 2001 From: Mackenzie Morgan Date: Wed, 20 May 2015 17:08:21 -0400 Subject: [PATCH 1/2] Moving myself (maco) to the committer section, since I was given commit bit a couple months back --- CONTRIBUTORS.md | 2 +- db/schema.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index ca3c7191a..294e48dd3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -12,6 +12,7 @@ submit the change with your pull request. - Cesy / [cesy](https://github.com/cesy) - Miles Gould / [pozorvlak](https://github.com/pozorvlak) - Taylor Griffin / [tygriffin](https://github.com/tygriffin) +- Mackenzie Morgan / [maco](https://github.com/maco) ## Contributors @@ -23,7 +24,6 @@ submit the change with your pull request. - Maia Sauren / [sauramaia](https://github.com/sauramaia) - Norman Ancajas / [nbancajas](https://github.com/nbancajas) - Jonathan "Duke" Leto / [leto](https://github.com/leto) -- Mackenzie Morgan / [maco](https://github.com/maco) - Amy Hendrix / [sabreuse](https://github.com/sabreuse) - CephLPod / [cephLpod](https://github.com/cephLpod/) - Gemma Mason / [gemmaellen](https://github.com/gemmaellen) diff --git a/db/schema.rb b/db/schema.rb index 7f8c479ce..6cbdd91b2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -405,7 +405,6 @@ ActiveRecord::Schema.define(version: 20150209105410) do t.datetime "updated_at" t.string "slug" t.integer "forum_id" - t.integer "parent_id" end add_index "posts", ["created_at", "author_id"], name: "index_posts_on_created_at_and_author_id", using: :btree From c5fbda02239e32ad6428d97615948f5a5ee314cc Mon Sep 17 00:00:00 2001 From: Mackenzie Morgan Date: Wed, 20 May 2015 17:10:22 -0400 Subject: [PATCH 2/2] cleaning up inadvertent schema change --- db/schema.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/db/schema.rb b/db/schema.rb index 6cbdd91b2..7f8c479ce 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -405,6 +405,7 @@ ActiveRecord::Schema.define(version: 20150209105410) do t.datetime "updated_at" t.string "slug" t.integer "forum_id" + t.integer "parent_id" end add_index "posts", ["created_at", "author_id"], name: "index_posts_on_created_at_and_author_id", using: :btree