1
0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00
Commit Graph

998 Commits

Author SHA1 Message Date
baa8a2fea5 Merge branch 'development' 2018-07-30 14:07:53 +00:00
ce8ad2b284 Switched back to puma because I think passenger is crashing docker. 2018-07-30 12:34:01 +00:00
dae9a33f86 Merge branch 'development' 2018-07-26 11:59:56 +00:00
93b726f425 Moving to passenger + nginx 2018-07-26 10:34:48 +00:00
1dbbed833e Switching back to Passenger and using tini to not have PID problems 2018-07-24 17:15:59 +00:00
8742003183 Merge branch 'development' 2018-07-24 15:15:49 +00:00
37cb8f816b Switch back to puma and ruby 2.4.4. Trying to fix stability problems. Docker daemon's are crashing after a period of time. 2018-07-24 14:22:00 +00:00
cb22111c3c Upgrade to mysql 5.7, tag memcached 1.5, and check for PID 1 on workers instead of ps. ps generates apparmor errors in the docker daemon. 2018-07-24 13:58:59 +00:00
9183a16d5d Want ability to run db:seed on prod if needed 2018-07-24 13:57:25 +00:00
2b98a6d96b Merge branch 'development' 2018-07-17 11:48:16 +00:00
933aa522b7 Forgot to update Gemfile.lock 2018-07-17 11:34:06 +00:00
1a6e2a08a8 Switching to passenger 2018-07-17 11:30:36 +00:00
94b6d9aaa3 Trying to get compose build working 2018-07-11 17:20:53 +00:00
ab87b78b4d Added build to test compose 2018-07-11 14:06:22 +00:00
cd94b9901d Updating to compose api version 3.3 2018-07-11 13:23:17 +00:00
edd47ba427 Merge branch 'development' 2018-07-09 16:03:02 +00:00
cdf42b4434 Check for vulns in gems 2018-07-09 14:59:36 +00:00
291c1f3bcc Ignore vendor/bundle folder 2018-07-09 14:59:21 +00:00
556ec4350d Merge branch 'development' 2018-07-09 14:06:04 +00:00
452333ffbf Added travis gem and updated heroku api key for travis 2018-07-09 13:43:15 +00:00
8b43bcf47b Merge branch 'development' 2018-07-07 13:29:11 -04:00
5033f1fcb4 Added healthcheck to docker compose files for workers 2018-07-07 12:26:33 -04:00
102fa3e67a Merge branch 'development' 2018-07-06 14:35:11 -04:00
018bccb1ef Fixed healthcheck syntax 2018-07-06 14:21:30 -04:00
65eaf5cfea Merge branch 'development' 2018-07-06 14:10:32 -04:00
31025ff833 Added healthcheck to dockerfile 2018-07-06 14:09:09 -04:00
68d41bb866 Fixing brakeman on CI 2018-05-04 09:58:19 -04:00
6aeb64538f Updated to Ruby 2.5.1 and Rails 5.2.0 2018-05-04 09:58:19 -04:00
5c8c275531 Updated gems 2018-05-04 09:58:19 -04:00
dd7e96a87a Added brakeman to running tests and added a silencer for secret key 2018-05-04 09:58:19 -04:00
6cb99c9de2 Revert "Removed old rvm travis tests"
This reverts commit ffcd33903f.
2018-05-04 09:58:18 -04:00
560f6ba046 Removed old rvm travis tests 2018-05-04 09:58:18 -04:00
f50def5d6d Run travis tests with docker 2018-05-04 09:58:18 -04:00
a2002c31ce Fixed depricated callback 2018-05-04 09:58:18 -04:00
89119cc75d Revert "Use git to find project_dir"
This reverts commit 81158be575.
2018-05-04 09:58:18 -04:00
3cfcc9ff91 Use git to find project_dir 2018-05-04 09:58:18 -04:00
45a7ab3e6c Reload tournament matches so generateweight moves finals to the last round as well 2018-05-04 09:58:18 -04:00
fc3b7694d3 Fixing brakeman on CI 2018-05-03 19:20:53 +00:00
5c1975ff44 Updated to Ruby 2.5.1 and Rails 5.2.0 2018-05-03 18:48:42 +00:00
a2f3d836ec Updated gems 2018-05-03 18:04:29 +00:00
5bd97b923a Added brakeman to running tests and added a silencer for secret key 2018-05-03 17:17:38 +00:00
533f0e0890 Revert "Removed old rvm travis tests"
This reverts commit ffcd33903f.
2018-05-03 14:01:55 +00:00
ffcd33903f Removed old rvm travis tests 2018-05-03 13:53:11 +00:00
d3ae73cb4a Run travis tests with docker 2018-05-03 12:55:44 +00:00
37c106fb06 Fixed depricated callback 2018-05-03 12:55:23 +00:00
a8ee3ffa61 Revert "Use git to find project_dir"
This reverts commit 81158be575.
2018-05-03 08:11:03 -04:00
81158be575 Use git to find project_dir 2018-04-24 08:55:50 -04:00
a52d2c6b70 Reload tournament matches so generateweight moves finals to the last round as well 2018-02-02 08:17:04 -05:00
b2ab1e0be1 Merge branch 'development' 2018-02-01 13:42:42 -05:00
ed23a8e997 Need to save unassigning mats 2018-02-01 13:42:35 -05:00