wrestlingdev.com

cody/wrestlingdev.com

Fork 0

mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-24 17:04:43 +00:00

Commit Graph

Select branches

Hide Pull Requests

64man

circleci-project-setup

dependabot/bundler/action_text-trix-2.1.17

dependabot/bundler/bcrypt-3.1.22

dependabot/bundler/json-2.19.2

dependabot/bundler/loofah-2.25.1

dependabot/bundler/nokogiri-1.19.1

dependabot/bundler/rack-3.2.5

development

master

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#40

#41

#41

#42

#42

#43

#43

#44

#44

#45

#45

#5

#5

#6

#7

#8

#9

1a6e2a08a8 Switching to passenger Jacob Cody Wimer 2018-07-17 11:30:36 +00:00
94b6d9aaa3 Trying to get compose build working Jacob Cody Wimer 2018-07-11 17:20:53 +00:00
ab87b78b4d Added build to test compose Jacob Cody Wimer 2018-07-11 14:06:22 +00:00
cd94b9901d Updating to compose api version 3.3 Jacob Cody Wimer 2018-07-11 13:23:17 +00:00
edd47ba427 Merge branch 'development' Jacob Cody Wimer 2018-07-09 16:03:02 +00:00
cdf42b4434 Check for vulns in gems Jacob Cody Wimer 2018-07-09 14:59:36 +00:00
291c1f3bcc Ignore vendor/bundle folder Jacob Cody Wimer 2018-07-09 14:59:21 +00:00
556ec4350d Merge branch 'development' Jacob Cody Wimer 2018-07-09 14:06:04 +00:00
452333ffbf Added travis gem and updated heroku api key for travis Jacob Cody Wimer 2018-07-09 13:43:15 +00:00
8b43bcf47b Merge branch 'development' Jacob Cody Wimer 2018-07-07 13:29:11 -04:00
5033f1fcb4 Added healthcheck to docker compose files for workers Jacob Cody Wimer 2018-07-07 12:26:33 -04:00
102fa3e67a Merge branch 'development' Jacob Cody Wimer 2018-07-06 14:35:11 -04:00
018bccb1ef Fixed healthcheck syntax Jacob Cody Wimer 2018-07-06 14:21:30 -04:00
65eaf5cfea Merge branch 'development' Jacob Cody Wimer 2018-07-06 14:10:32 -04:00
31025ff833 Added healthcheck to dockerfile Jacob Cody Wimer 2018-07-06 14:09:09 -04:00
68d41bb866 Fixing brakeman on CI Jacob Cody Wimer 2018-05-03 19:20:53 +00:00
6aeb64538f Updated to Ruby 2.5.1 and Rails 5.2.0 Jacob Cody Wimer 2018-05-03 18:45:25 +00:00
5c8c275531 Updated gems Jacob Cody Wimer 2018-05-03 18:04:29 +00:00
dd7e96a87a Added brakeman to running tests and added a silencer for secret key Jacob Cody Wimer 2018-05-03 17:17:38 +00:00
6cb99c9de2 Revert "Removed old rvm travis tests" Jacob Cody Wimer 2018-05-03 14:01:55 +00:00
560f6ba046 Removed old rvm travis tests Jacob Cody Wimer 2018-05-03 13:53:11 +00:00
f50def5d6d Run travis tests with docker Jacob Cody Wimer 2018-05-03 12:55:44 +00:00
a2002c31ce Fixed depricated callback Jacob Cody Wimer 2018-05-03 12:55:23 +00:00
89119cc75d Revert "Use git to find project_dir" Jacob Cody Wimer 2018-05-03 08:11:03 -04:00
3cfcc9ff91 Use git to find project_dir Jacob Cody Wimer 2018-04-24 08:55:50 -04:00
45a7ab3e6c Reload tournament matches so generateweight moves finals to the last round as well Jacob Cody Wimer 2018-02-02 08:17:04 -05:00
fc3b7694d3 Fixing brakeman on CI Jacob Cody Wimer 2018-05-03 19:20:53 +00:00
5c1975ff44 Updated to Ruby 2.5.1 and Rails 5.2.0 Jacob Cody Wimer 2018-05-03 18:45:25 +00:00
a2f3d836ec Updated gems Jacob Cody Wimer 2018-05-03 18:04:29 +00:00
5bd97b923a Added brakeman to running tests and added a silencer for secret key Jacob Cody Wimer 2018-05-03 17:17:38 +00:00
533f0e0890 Revert "Removed old rvm travis tests" Jacob Cody Wimer 2018-05-03 14:01:55 +00:00
ffcd33903f Removed old rvm travis tests Jacob Cody Wimer 2018-05-03 13:53:11 +00:00
d3ae73cb4a Run travis tests with docker Jacob Cody Wimer 2018-05-03 12:55:44 +00:00
37c106fb06 Fixed depricated callback Jacob Cody Wimer 2018-05-03 12:55:23 +00:00
a8ee3ffa61 Revert "Use git to find project_dir" Jacob Cody Wimer 2018-05-03 08:11:03 -04:00
81158be575 Use git to find project_dir Jacob Cody Wimer 2018-04-24 08:55:50 -04:00
a52d2c6b70 Reload tournament matches so generateweight moves finals to the last round as well Jacob Cody Wimer 2018-02-02 08:17:04 -05:00
b2ab1e0be1 Merge branch 'development' Jacob Cody Wimer 2018-02-01 13:42:42 -05:00
ed23a8e997 Need to save unassigning mats Jacob Cody Wimer 2018-02-01 13:42:35 -05:00
7840ae6f10 Merge branch 'development' Jacob Cody Wimer 2018-02-01 09:27:24 -05:00
bfd4c0c702 Run background actions if winner_id or finished changes Jacob Cody Wimer 2018-02-01 09:26:22 -05:00
6bf0c9dc81 Run background actions if winner_id or finished changes Jacob Cody Wimer 2018-02-01 09:26:22 -05:00
b0cfe008f3 Merge branch 'development' Jacob Cody Wimer 2018-02-01 08:16:42 -05:00
0ac3efa615 Force curently genrating matches to be nil Jacob Cody Wimer 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. Jacob Cody Wimer 2018-02-01 07:45:08 -05:00
ada1cac436 Corrected query for upcoming matches on bout board Jacob Cody Wimer 2018-02-01 07:44:58 -05:00
df397f55e3 Trying to get curently generating matches to be nil Jacob Cody Wimer 2018-02-01 07:13:06 -05:00
98777db553 Merge branch 'development' Jacob Cody Wimer 2018-01-31 09:31:10 -05:00
cda7e21d34 Fixed typo to fix bug Jacob Cody Wimer 2018-01-31 09:31:03 -05:00
d7899ca243 Merge branch 'development' Jacob Cody Wimer 2018-01-31 09:17:18 -05:00
ebbc92e0c0 Only assign matches with about number Jacob Cody Wimer 2018-01-31 09:15:48 -05:00
efaea8f19d Merge branch 'development' Jacob Cody Wimer 2018-01-31 08:50:02 -05:00
275e65c7a1 When generating a new weight, wipe mats from matches Jacob Cody Wimer 2018-01-31 08:49:38 -05:00
33338df7ed Merge branch 'development' Jacob Cody Wimer 2018-01-31 08:00:17 -05:00
9841f5648d Discard ActiveRecord association cache so generating a single weight class of matches works Jacob Cody Wimer 2018-01-31 07:59:48 -05:00
b764476bef Merge branch 'development' Jacob Cody Wimer 2018-01-31 07:39:04 -05:00
53598152cf Realigned file and sorted matches by weight and round when assigning bouts Jacob Cody Wimer 2018-01-31 07:26:15 -05:00
817cb941f7 Merge branch 'development' Jacob Cody Wimer 2018-01-10 08:01:09 -05:00
6d75d26f3b Copyright current year Jacob Cody Wimer 2018-01-10 07:32:17 -05:00
ff4cb52541 Upgrade packages upon build for prod Jacob Cody Wimer 2018-01-09 07:59:49 -05:00
a36a083826 Moved files out of the root of the project to bin and deploy where they belong Jacob Cody Wimer 2018-01-09 07:58:37 -05:00
05a71e8f05 Accidental swap file Jacob Cody Wimer 2017-12-18 07:53:32 -05:00
ec1d23f7db Merge branch 'master' of https://github.com/jcwimer/wrestlingApp Jacob Cody Wimer 2017-12-18 07:52:14 -05:00
d88000f06a Added a stats page for teams Jacob Cody Wimer 2017-12-18 07:51:38 -05:00
ba05573928 Pretty up wrestler show page Jacob Cody Wimer 2017-12-14 09:03:31 -05:00
7831bfaf6b Pretty up wrestler show page Jacob Cody Wimer 2017-12-14 09:03:31 -05:00
03f3b8dcff Break down wrestlers points on the show page Jacob Cody Wimer 2017-12-13 11:12:23 -05:00
dac040d4f2 Added example format for tournament date Jacob Cody Wimer 2017-12-13 09:02:19 -05:00
2ed0d94227 Updated to ruby 2.4.2 on travis ci Jacob Cody Wimer 2017-12-11 08:02:49 -05:00
96d911ad09 Updated to ruby 2.4.2 and rails 5.1.4 Jacob Cody Wimer 2017-12-11 07:57:26 -05:00
181d56f12d Break down wrestlers points on the show page Jacob Cody Wimer 2017-12-13 11:12:23 -05:00
7fb8e198ea Added example format for tournament date Jacob Cody Wimer 2017-12-13 09:02:19 -05:00
268647c506 Updated to ruby 2.4.2 on travis ci Jacob Cody Wimer 2017-12-11 08:02:49 -05:00
8ff2bba87a Updated to ruby 2.4.2 and rails 5.1.4 Jacob Cody Wimer 2017-12-11 07:57:26 -05:00
d22d57c0e0 Merge branch 'development' Jacob Cody Wimer 2017-11-29 13:58:45 -05:00
e22e3af8eb Tidied up Dockerfiles Jacob Cody Wimer 2017-11-29 08:29:45 -05:00
dc81df56d2 Merge branch 'development' Jacob Cody Wimer 2017-11-18 19:38:32 -05:00
0c9af7fcb3 Added stats to wrestler -> show Jacob Cody Wimer 2017-11-14 07:43:06 -05:00
62faa4f307 Added info about bye points Jacob Cody Wimer 2017-11-14 07:42:21 -05:00
da37cc9eff Did not want to add .swp files Jacob Cody Wimer 2017-11-13 08:44:26 -05:00
5cfcfe0448 Added info to match edit (mat -> show) and up_matches pages. Jacob Cody Wimer 2017-11-13 08:42:16 -05:00
94bb5affa3 Added Gemfile.lock to docker build Jacob Cody Wimer 2017-11-09 08:53:04 -05:00
4089d37825 Fixed query issue for advancing losing wrestlers in a 'pool to bracket' bracket Jacob Cody Wimer 2017-11-09 08:13:29 -05:00
611f54f522 Keeping Gemfile.lock for versioning of gems Jacob Cody Wimer 2017-11-07 12:56:27 -05:00
16d63b52cd Made a test for the swap wrestlers service Jacob Cody Wimer 2017-09-04 21:53:28 -04:00
e40851d9fc Pool numbers need swapped when wrestlers are swapped Jacob Cody Wimer 2017-09-02 11:48:23 -04:00
594469f4d8 Gemfile.lock no longer exists in repo Jacob Cody Wimer 2017-08-29 13:52:26 -04:00
5bebc342a6 Gemfile.lock should not be in source control Jacob Cody Wimer 2017-08-29 13:03:30 -04:00
e168d0b51d Added functionality for a tournament director to move a wrestler to a pool that has a bye for greater flexibility Jacob Cody Wimer 2017-08-29 13:02:00 -04:00
f9fb3e4108 Remove intrusive ads Jacob Cody Wimer 2017-08-12 23:30:00 -04:00
123dc6b332 Using local docker registry for test image Jacob Cody Wimer 2017-08-12 21:26:16 -04:00
5f31879af8 Remove bad ads Jacob Cody Wimer 2017-08-11 08:55:17 -04:00
6fb304f5c7 Secret key base and devise key added for dev Jacob Cody Wimer 2017-08-10 20:43:18 -04:00
c839e2e843 Fixed a eager load bug Jacob Cody Wimer 2017-06-09 18:00:20 -04:00
0fb2e7009b Updated migrations to support new rails version Jacob Cody Wimer 2017-06-09 07:22:32 -04:00
89443f770e Updated .travis.yml to db:migrate when deploying Jacob Cody Wimer 2017-06-08 21:54:33 -04:00
573b3c3e12 Updated ruby version in .travis.yml Jacob Cody Wimer 2017-06-08 21:51:22 -04:00
a3c768b0bb Updated README to reflect new versions of rails and ruby Jacob Cody Wimer 2017-06-08 21:47:47 -04:00
98e63a2ff0 Upgraded to Rails 5.1.1 Jacob Cody Wimer 2017-06-08 21:45:36 -04:00
f409918f5b Separate apt-get clean and apt-get update on multiple lines Jacob Cody Wimer 2017-06-02 21:42:30 -04:00

... 3 4 5 6 7 ...