8 commits

Author	SHA1	Message	Date
Ari Timonen	88721b28df	Fixes for development ... Temporary fix for puma.rb Rename .env.dev Fix more merge conflicts Dev env runs and tests run (with fails)	2020-03-14 21:43:19 +02:00
Ari Timonen	2c71b1147d	Merge rails-4 to rails4	2020-03-14 21:10:24 +02:00
Ari Timonen	a511fb526e	Fix merge conflicts	2020-03-08 22:58:52 +02:00
Ari Timonen	eff0543750	Update docker-compose	2020-03-07 21:08:37 +02:00
Ari Timonen	4402677704	Add dev dockerfiles	2019-12-08 02:20:54 +02:00
Ari Timonen	bb08000f1e	Add working test	2019-10-18 02:51:40 +03:00
Ari Timonen	758dfda988	Update for rails 4 ... Mostly tests	2019-10-17 21:29:15 +03:00
Ari Timonen	11fcea3259	Add docker dev version ... Add env and docker files for development Fix some random things related to rails upgrade	2019-09-24 22:55:34 +03:00