DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	app/views/users/recapitulatif/show.html.haml
	spec/features/recapitulatif_page/_commentaires_flux_spec.rb
	spec/features/recapitulatif_page/show_page_spec.rb
This commit is contained in:
Xavier J 2015-09-24 10:56:12 +02:00
commit 8693f4194c
80 changed files with 1414 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

25
db/schema.rb
View file

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20150922141000) do
ActiveRecord::Schema.define(version: 20150923101000) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -46,10 +46,12 @@ ActiveRecord::Schema.define(version: 20150922141000) do
t.date "date_previsionnelle"
t.datetime "created_at"
t.datetime "updated_at"
t.string "state"
t.string "state"
t.integer "user_id"
end
add_index "dossiers", ["procedure_id"], name: "index_dossiers_on_procedure_id", using: :btree
add_index "dossiers", ["user_id"], name: "index_dossiers_on_user_id", using: :btree
create_table "entreprises", force: :cascade do |t|
t.string "siren"
@ -130,6 +132,25 @@ ActiveRecord::Schema.define(version: 20150922141000) do
t.integer "procedure_id"
end
create_table "users", force: :cascade do |t|
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.inet "current_sign_in_ip"
t.inet "last_sign_in_ip"
t.datetime "created_at"
t.datetime "updated_at"
end
add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
add_foreign_key "cerfas", "dossiers"
add_foreign_key "commentaires", "dossiers"
add_foreign_key "dossiers", "users"
end