From f22a795e04c52dd85cb55df61918759f17249a40 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Mon, 15 Sep 2014 11:29:19 +0200 Subject: [PATCH] Fix db/schema.rb after merge First I did `rake dev:setup` at 405a5acbb5f8; then `rake db:migrate` at e93523ed312ee80. --- db/schema.rb | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 1993dec6f0..c9079ea936 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -303,25 +303,14 @@ ActiveRecord::Schema.define(version: 20140907220153) do create_table "services", force: true do |t| t.string "type" t.string "title" - # This is a mess, will fix in a commit after the merge commit -- JV - t.string "token" t.integer "project_id", null: false t.datetime "created_at" t.datetime "updated_at" t.boolean "active", default: false, null: false - t.string "project_url" - t.string "subdomain" - t.string "room" - t.text "recipients" - t.string "api_key" t.string "username" t.string "password" t.string "api_version" t.string "jira_issue_transition_id", default: "2" - t.integer "project_id", null: false - t.datetime "created_at" - t.datetime "updated_at" - t.boolean "active", default: false, null: false t.text "properties" end