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

783 Commits

Author SHA1 Message Date
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
7840ae6f10 Merge branch 'development' 2018-02-01 09:27:24 -05:00
bfd4c0c702 Run background actions if winner_id or finished changes 2018-02-01 09:27:16 -05:00
6bf0c9dc81 Run background actions if winner_id or finished changes 2018-02-01 09:26:22 -05:00
b0cfe008f3 Merge branch 'development' 2018-02-01 08:16:42 -05:00
0ac3efa615 Force curently genrating matches to be nil 2018-02-01 08:16:28 -05:00
22d2d7a0b0 Fixed query for upcoming matches on the bout board and trying to fix why currently generating matches is not nil when
generating a single weight class.
2018-02-01 07:45:08 -05:00
ada1cac436 Corrected query for upcoming matches on bout board 2018-02-01 07:44:58 -05:00
df397f55e3 Trying to get curently generating matches to be nil 2018-02-01 07:13:06 -05:00
98777db553 Merge branch 'development' 2018-01-31 09:31:10 -05:00
cda7e21d34 Fixed typo to fix bug 2018-01-31 09:31:03 -05:00
d7899ca243 Merge branch 'development' 2018-01-31 09:17:18 -05:00
ebbc92e0c0 Only assign matches with about number 2018-01-31 09:15:48 -05:00
efaea8f19d Merge branch 'development' 2018-01-31 08:50:02 -05:00
275e65c7a1 When generating a new weight, wipe mats from matches 2018-01-31 08:49:38 -05:00
33338df7ed Merge branch 'development' 2018-01-31 08:00:17 -05:00