Commit 78bf5863 authored by Michael Kozono's avatar Michael Kozono

Fix schema.rb conflict resolution

parent 16260dee
...@@ -178,7 +178,6 @@ ActiveRecord::Schema.define(version: 20171230123729) do ...@@ -178,7 +178,6 @@ ActiveRecord::Schema.define(version: 20171230123729) do
t.integer "gitaly_timeout_medium", default: 30, null: false t.integer "gitaly_timeout_medium", default: 30, null: false
t.integer "gitaly_timeout_fast", default: 10, null: false t.integer "gitaly_timeout_fast", default: 10, null: false
t.boolean "mirror_available", default: true, null: false t.boolean "mirror_available", default: true, null: false
t.boolean "authorized_keys_enabled", default: true, null: false
end end
create_table "approvals", force: :cascade do |t| create_table "approvals", force: :cascade do |t|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment