Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop

This commit is contained in:
Xavier J 2015-09-22 13:16:09 +02:00
commit 017c90f7b6
12 changed files with 40 additions and 15 deletions

View file

@ -1,6 +1,6 @@
class AddTimeStampToDossier < ActiveRecord::Migration
def change
add_column :dossiers, :created_at, :datetime
add_column :dossiers, :updated_at, :datetime
add_column :dossiers, :created_at, :datetime, default: Time.now
add_column :dossiers, :updated_at, :datetime, default: Time.now
end
end

View file

@ -47,8 +47,8 @@ ActiveRecord::Schema.define(version: 20150922110719) do
t.boolean "dossier_termine"
t.integer "procedure_id"
t.date "date_previsionnelle"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", default: '2015-09-22 09:25:29'
t.datetime "updated_at", default: '2015-09-22 09:25:29'
end
add_index "dossiers", ["procedure_id"], name: "index_dossiers_on_procedure_id", using: :btree