1
0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-05-20 20:17:45 +00:00

5 Commits

Author SHA1 Message Date
894877e657 Add .circleci/config.yml 2020-11-06 12:20:56 -05:00
aa76318321 Updated gems 2020-09-15 09:32:01 -04:00
a693905c62 Added instant page 2020-09-15 09:25:08 -04:00
3559977e72 Minor rails upgrade 2020-06-26 11:00:49 -04:00
4a43f5e53f Updating gems 2020-06-26 10:19:45 -04:00
5 changed files with 136 additions and 117 deletions

10
.circleci/config.yml Normal file
View File

@@ -0,0 +1,10 @@
version: 2
jobs:
build:
machine: true
steps:
- checkout
# start proprietary DB using private Docker image
# with credentials stored in the UI
- run: |
bash bin/run-tests-with-docker.sh

View File

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
ruby '2.6.5' ruby '2.6.5'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '6.0.1' gem 'rails', '6.0.3.2'
# Use sqlite3 as the database for Active Record # Use sqlite3 as the database for Active Record
#gem 'sqlite3', '~> 1.3', '< 1.4', :group => :development #gem 'sqlite3', '~> 1.3', '< 1.4', :group => :development
gem 'sqlite3', :group => :development gem 'sqlite3', :group => :development

View File

@@ -1,71 +1,71 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (6.0.1) actioncable (6.0.3.2)
actionpack (= 6.0.1) actionpack (= 6.0.3.2)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.0.1) actionmailbox (6.0.3.2)
actionpack (= 6.0.1) actionpack (= 6.0.3.2)
activejob (= 6.0.1) activejob (= 6.0.3.2)
activerecord (= 6.0.1) activerecord (= 6.0.3.2)
activestorage (= 6.0.1) activestorage (= 6.0.3.2)
activesupport (= 6.0.1) activesupport (= 6.0.3.2)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.0.1) actionmailer (6.0.3.2)
actionpack (= 6.0.1) actionpack (= 6.0.3.2)
actionview (= 6.0.1) actionview (= 6.0.3.2)
activejob (= 6.0.1) activejob (= 6.0.3.2)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.0.1) actionpack (6.0.3.2)
actionview (= 6.0.1) actionview (= 6.0.3.2)
activesupport (= 6.0.1) activesupport (= 6.0.3.2)
rack (~> 2.0) rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.1) actiontext (6.0.3.2)
actionpack (= 6.0.1) actionpack (= 6.0.3.2)
activerecord (= 6.0.1) activerecord (= 6.0.3.2)
activestorage (= 6.0.1) activestorage (= 6.0.3.2)
activesupport (= 6.0.1) activesupport (= 6.0.3.2)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.0.1) actionview (6.0.3.2)
activesupport (= 6.0.1) activesupport (= 6.0.3.2)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.1) activejob (6.0.3.2)
activesupport (= 6.0.1) activesupport (= 6.0.3.2)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.0.1) activemodel (6.0.3.2)
activesupport (= 6.0.1) activesupport (= 6.0.3.2)
activerecord (6.0.1) activerecord (6.0.3.2)
activemodel (= 6.0.1) activemodel (= 6.0.3.2)
activesupport (= 6.0.1) activesupport (= 6.0.3.2)
activestorage (6.0.1) activestorage (6.0.3.2)
actionpack (= 6.0.1) actionpack (= 6.0.3.2)
activejob (= 6.0.1) activejob (= 6.0.3.2)
activerecord (= 6.0.1) activerecord (= 6.0.3.2)
marcel (~> 0.3.1) marcel (~> 0.3.1)
activesupport (6.0.1) activesupport (6.0.3.2)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
zeitwerk (~> 2.2) zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.4.0) addressable (2.4.0)
ast (2.4.0) ast (2.4.1)
backports (3.15.0) backports (3.18.2)
bcrypt (3.1.13) bcrypt (3.1.16)
brakeman (4.7.1) brakeman (4.9.1)
builder (3.2.3) builder (3.2.4)
bullet (6.0.2) bullet (6.1.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
uniform_notifier (~> 1.11) uniform_notifier (~> 1.11)
cancancan (3.0.1) cancancan (3.1.0)
coffee-rails (5.0.0) coffee-rails (5.0.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 5.2.0) railties (>= 5.2.0)
@@ -75,8 +75,8 @@ GEM
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
commander (4.4.6) commander (4.4.6)
highline (~> 1.7.2) highline (~> 1.7.2)
concurrent-ruby (1.1.5) concurrent-ruby (1.1.7)
crass (1.0.5) crass (1.0.6)
daemons (1.3.1) daemons (1.3.1)
dalli (2.7.10) dalli (2.7.10)
delayed_job (4.1.8) delayed_job (4.1.8)
@@ -89,7 +89,7 @@ GEM
delayed_job (> 2.0.3) delayed_job (> 2.0.3)
rack-protection (>= 1.5.5) rack-protection (>= 1.5.5)
sinatra (>= 1.4.4) sinatra (>= 1.4.4)
devise (4.7.1) devise (4.7.2)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 4.1.0) railties (>= 4.1.0)
@@ -101,11 +101,11 @@ GEM
ethon (0.12.0) ethon (0.12.0)
ffi (>= 1.3.0) ffi (>= 1.3.0)
execjs (2.7.0) execjs (2.7.0)
faraday (0.17.0) faraday (0.17.3)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faraday_middleware (0.13.1) faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0) faraday (>= 0.7.4, < 1.0)
ffi (1.11.2) ffi (1.13.1)
gh (0.15.1) gh (0.15.1)
addressable (~> 2.4.0) addressable (~> 2.4.0)
backports backports
@@ -128,76 +128,76 @@ GEM
http-accept (1.7.0) http-accept (1.7.0)
http-cookie (1.0.3) http-cookie (1.0.3)
domain_name (~> 0.5) domain_name (~> 0.5)
i18n (1.7.0) i18n (1.8.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4) jbuilder (2.10.1)
jbuilder (2.9.1) activesupport (>= 5.0.0)
activesupport (>= 4.2.0) jquery-rails (4.4.0)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (2.2.0) json (2.3.1)
launchy (2.4.3) launchy (2.4.3)
addressable (~> 2.3) addressable (~> 2.3)
libv8 (3.16.14.19) libv8 (3.16.14.19)
loofah (2.3.1) loofah (2.7.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
marcel (0.3.3) marcel (0.3.3)
mimemagic (~> 0.3.2) mimemagic (~> 0.3.2)
method_source (0.9.2) method_source (1.0.0)
mime-types (3.3) mime-types (3.3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009) mime-types-data (3.2020.0512)
mimemagic (0.3.3) mimemagic (0.3.5)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.4.0)
minitest (5.13.0) minitest (5.14.2)
multi_json (1.14.1) multi_json (1.15.0)
multipart-post (2.1.1) multipart-post (2.1.1)
mustermann (1.0.3) mustermann (1.1.1)
mysql2 (0.5.2) ruby2_keywords (~> 0.0.1)
mysql2 (0.5.3)
net-http-persistent (2.9.4) net-http-persistent (2.9.4)
net-http-pipeline (1.0.1) net-http-pipeline (1.0.1)
netrc (0.11.0) netrc (0.11.0)
newrelic_rpm (6.7.0.359) newrelic_rpm (6.12.0.367)
nio4r (2.5.2) nio4r (2.5.3)
nokogiri (1.10.5) nokogiri (1.10.10)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parallel (1.19.0) parallel (1.19.2)
parser (2.6.5.0) parser (2.7.1.4)
ast (~> 2.4.0) ast (~> 2.4.1)
passenger (6.0.4) passenger (6.0.6)
rack rack
rake (>= 0.8.1) rake (>= 0.8.1)
puma (4.3.0) puma (4.3.6)
nio4r (~> 2.0) nio4r (~> 2.0)
pusher-client (0.6.2) pusher-client (0.6.2)
json json
websocket (~> 1.0) websocket (~> 1.0)
rack (2.0.7) rack (2.2.3)
rack-protection (2.0.7) rack-protection (2.1.0)
rack rack
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (6.0.1) rails (6.0.3.2)
actioncable (= 6.0.1) actioncable (= 6.0.3.2)
actionmailbox (= 6.0.1) actionmailbox (= 6.0.3.2)
actionmailer (= 6.0.1) actionmailer (= 6.0.3.2)
actionpack (= 6.0.1) actionpack (= 6.0.3.2)
actiontext (= 6.0.1) actiontext (= 6.0.3.2)
actionview (= 6.0.1) actionview (= 6.0.3.2)
activejob (= 6.0.1) activejob (= 6.0.3.2)
activemodel (= 6.0.1) activemodel (= 6.0.3.2)
activerecord (= 6.0.1) activerecord (= 6.0.3.2)
activestorage (= 6.0.1) activestorage (= 6.0.3.2)
activesupport (= 6.0.1) activesupport (= 6.0.3.2)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 6.0.1) railties (= 6.0.3.2)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
@@ -209,18 +209,19 @@ GEM
rails_stdout_logging rails_stdout_logging
rails_serve_static_assets (0.0.5) rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5) rails_stdout_logging (0.0.5)
railties (6.0.1) railties (6.0.3.2)
actionpack (= 6.0.1) actionpack (= 6.0.3.2)
activesupport (= 6.0.1) activesupport (= 6.0.3.2)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0) thor (>= 0.20.3, < 2.0)
rainbow (3.0.0) rainbow (3.0.0)
rake (13.0.1) rake (13.0.1)
rb-readline (0.5.5) rb-readline (0.5.5)
rdoc (6.2.0) rdoc (6.2.1)
ref (2.0.0) ref (2.0.0)
responders (3.0.0) regexp_parser (1.7.1)
responders (3.0.1)
actionpack (>= 5.0) actionpack (>= 5.0)
railties (>= 5.0) railties (>= 5.0)
rest-client (2.1.0) rest-client (2.1.0)
@@ -228,40 +229,46 @@ GEM
http-cookie (>= 1.0.2, < 2.0) http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0) mime-types (>= 1.16, < 4.0)
netrc (~> 0.8) netrc (~> 0.8)
rexml (3.2.4)
round_robin_tournament (0.0.1) round_robin_tournament (0.0.1)
rubocop (0.76.0) rubocop (0.91.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.6) parser (>= 2.7.1.1)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
rexml
rubocop-ast (>= 0.4.0, < 1.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7) unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.4.0)
parser (>= 2.7.1.4)
ruby-progressbar (1.10.1) ruby-progressbar (1.10.1)
sdoc (1.0.0) ruby2_keywords (0.0.2)
sdoc (1.1.0)
rdoc (>= 5.0) rdoc (>= 5.0)
sinatra (2.0.7) sinatra (2.1.0)
mustermann (~> 1.0) mustermann (~> 1.0)
rack (~> 2.0) rack (~> 2.2)
rack-protection (= 2.0.7) rack-protection (= 2.1.0)
tilt (~> 2.0) tilt (~> 2.0)
spring (2.1.0) spring (2.1.1)
sprockets (4.0.0) sprockets (4.0.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.2.1) sprockets-rails (3.2.2)
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.4.1) sqlite3 (1.4.2)
terminal-table (1.8.0) terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (~> 1.1, >= 1.1.1)
therubyracer (0.12.3) therubyracer (0.12.3)
libv8 (~> 3.16.14.15) libv8 (~> 3.16.14.15)
ref ref
thor (0.20.3) thor (1.0.1)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.10) tilt (2.0.10)
travis (1.8.10) travis (1.8.13)
backports backports
faraday (~> 0.9) faraday (~> 0.9)
faraday_middleware (~> 0.9, >= 0.9.1) faraday_middleware (~> 0.9, >= 0.9.1)
@@ -275,24 +282,24 @@ GEM
turbolinks-source (5.2.0) turbolinks-source (5.2.0)
typhoeus (0.8.0) typhoeus (0.8.0)
ethon (>= 0.8.0) ethon (>= 0.8.0)
tzinfo (1.2.5) tzinfo (1.2.7)
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo-data (1.2019.3) tzinfo-data (1.2020.1)
tzinfo (>= 1.0.0) tzinfo (>= 1.0.0)
uglifier (4.2.0) uglifier (4.2.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.7.6) unf_ext (0.0.7.7)
unicode-display_width (1.6.0) unicode-display_width (1.7.0)
uniform_notifier (1.13.0) uniform_notifier (1.13.0)
warden (1.2.8) warden (1.2.9)
rack (>= 2.0.6) rack (>= 2.0.9)
websocket (1.2.8) websocket (1.2.8)
websocket-driver (0.7.1) websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4) websocket-extensions (0.1.5)
zeitwerk (2.2.1) zeitwerk (2.4.0)
PLATFORMS PLATFORMS
ruby ruby
@@ -314,7 +321,7 @@ DEPENDENCIES
newrelic_rpm newrelic_rpm
passenger passenger
puma puma
rails (= 6.0.1) rails (= 6.0.3.2)
rails_12factor rails_12factor
rb-readline rb-readline
round_robin_tournament round_robin_tournament

View File

@@ -0,0 +1 @@
<script src="//instant.page/5.1.0" type="module" integrity="sha384-by67kQnR+pyfy8yWP4kPO12fHKRLHZPfEsiSXR8u2IKcTdxD805MGUXBzVPnkLHw"></script>

View File

@@ -22,6 +22,7 @@
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
<%= render 'layouts/cdn' %> <%= render 'layouts/cdn' %>
<%= render 'layouts/shim' %> <%= render 'layouts/shim' %>
<%= render 'layouts/instantpage' %>
</head> </head>
<body style="padding-top: 70px;"> <body style="padding-top: 70px;">
<div class="container"> <div class="container">