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

Upgraded to Rails 6.0.1

This commit is contained in:
2019-11-19 13:41:17 -05:00
parent 8a9ea7ff35
commit 76b7b82716
6 changed files with 139 additions and 118 deletions

View File

@@ -2,9 +2,10 @@ source 'https://rubygems.org'
ruby '2.6.0' ruby '2.6.0'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '5.2.2' gem 'rails', '6.0.1'
# 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'
# Use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets
gem 'uglifier' gem 'uglifier'

View File

@@ -1,61 +1,74 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (5.2.2) actioncable (6.0.1)
actionpack (= 5.2.2) actionpack (= 6.0.1)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailer (5.2.2) actionmailbox (6.0.1)
actionpack (= 5.2.2) actionpack (= 6.0.1)
actionview (= 5.2.2) activejob (= 6.0.1)
activejob (= 5.2.2) activerecord (= 6.0.1)
activestorage (= 6.0.1)
activesupport (= 6.0.1)
mail (>= 2.7.1)
actionmailer (6.0.1)
actionpack (= 6.0.1)
actionview (= 6.0.1)
activejob (= 6.0.1)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.2.2) actionpack (6.0.1)
actionview (= 5.2.2) actionview (= 6.0.1)
activesupport (= 5.2.2) activesupport (= 6.0.1)
rack (~> 2.0) rack (~> 2.0)
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.0.2) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (5.2.2) actiontext (6.0.1)
activesupport (= 5.2.2) actionpack (= 6.0.1)
activerecord (= 6.0.1)
activestorage (= 6.0.1)
activesupport (= 6.0.1)
nokogiri (>= 1.8.5)
actionview (6.0.1)
activesupport (= 6.0.1)
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.0, >= 1.0.3) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (5.2.2) activejob (6.0.1)
activesupport (= 5.2.2) activesupport (= 6.0.1)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.2.2) activemodel (6.0.1)
activesupport (= 5.2.2) activesupport (= 6.0.1)
activerecord (5.2.2) activerecord (6.0.1)
activemodel (= 5.2.2) activemodel (= 6.0.1)
activesupport (= 5.2.2) activesupport (= 6.0.1)
arel (>= 9.0) activestorage (6.0.1)
activestorage (5.2.2) actionpack (= 6.0.1)
actionpack (= 5.2.2) activejob (= 6.0.1)
activerecord (= 5.2.2) activerecord (= 6.0.1)
marcel (~> 0.3.1) marcel (~> 0.3.1)
activesupport (5.2.2) activesupport (6.0.1)
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)
addressable (2.4.0) addressable (2.4.0)
arel (9.0.0)
ast (2.4.0) ast (2.4.0)
backports (3.13.0) backports (3.15.0)
bcrypt (3.1.12) bcrypt (3.1.13)
brakeman (4.5.0) brakeman (4.7.1)
builder (3.2.3) builder (3.2.3)
bullet (5.9.0) bullet (6.0.2)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
uniform_notifier (~> 1.11) uniform_notifier (~> 1.11)
cancancan (3.0.1) cancancan (3.0.1)
coffee-rails (4.2.2) coffee-rails (5.0.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0) railties (>= 5.2.0)
coffee-script (2.4.1) coffee-script (2.4.1)
coffee-script-source coffee-script-source
execjs execjs
@@ -63,36 +76,36 @@ GEM
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.5)
crass (1.0.4) crass (1.0.5)
daemons (1.3.1) daemons (1.3.1)
dalli (2.7.10) dalli (2.7.10)
delayed_job (4.1.5) delayed_job (4.1.8)
activesupport (>= 3.0, < 5.3) activesupport (>= 3.0, < 6.1)
delayed_job_active_record (4.1.3) delayed_job_active_record (4.1.4)
activerecord (>= 3.0, < 5.3) activerecord (>= 3.0, < 6.1)
delayed_job (>= 3.0, < 5) delayed_job (>= 3.0, < 5)
delayed_job_web (1.4.3) delayed_job_web (1.4.3)
activerecord (> 3.0.0) activerecord (> 3.0.0)
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.6.2) devise (4.7.1)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0) railties (>= 4.1.0)
responders responders
warden (~> 1.2.3) warden (~> 1.2.3)
domain_name (0.5.20180417) domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
erubi (1.8.0) erubi (1.9.0)
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.15.4) faraday (0.17.0)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faraday_middleware (0.13.1) faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0) faraday (>= 0.7.4, < 1.0)
ffi (1.10.0) ffi (1.11.2)
gh (0.15.1) gh (0.15.1)
addressable (~> 2.4.0) addressable (~> 2.4.0)
backports backports
@@ -112,15 +125,15 @@ GEM
rest-client rest-client
terminal-table terminal-table
highline (1.7.10) highline (1.7.10)
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.6.0) i18n (1.7.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jaro_winkler (1.5.2) jaro_winkler (1.5.4)
jbuilder (2.8.0) jbuilder (2.9.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
multi_json (>= 1.2) jquery-rails (4.3.5)
jquery-rails (4.3.3)
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)
@@ -128,7 +141,7 @@ GEM
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.2.3) loofah (2.3.1)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
@@ -136,109 +149,110 @@ GEM
marcel (0.3.3) marcel (0.3.3)
mimemagic (~> 0.3.2) mimemagic (~> 0.3.2)
method_source (0.9.2) method_source (0.9.2)
mime-types (3.2.2) mime-types (3.3)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331) mime-types-data (3.2019.1009)
mimemagic (0.3.3) mimemagic (0.3.3)
mini_mime (1.0.1) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.4.0)
minitest (5.11.3) minitest (5.13.0)
multi_json (1.13.1) multi_json (1.14.1)
multipart-post (2.0.0) multipart-post (2.1.1)
mustermann (1.0.3) mustermann (1.0.3)
mysql2 (0.5.2) mysql2 (0.5.2)
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.2.0.354) newrelic_rpm (6.7.0.359)
nio4r (2.3.1) nio4r (2.5.2)
nokogiri (1.10.2) nokogiri (1.10.5)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parallel (1.17.0) parallel (1.19.0)
parser (2.6.2.1) parser (2.6.5.0)
ast (~> 2.4.0) ast (~> 2.4.0)
passenger (6.0.2) passenger (6.0.4)
rack rack
rake (>= 0.8.1) rake (>= 0.8.1)
psych (3.1.0) puma (4.3.0)
puma (3.12.1) 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.0.7)
rack-protection (2.0.5) rack-protection (2.0.7)
rack rack
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (5.2.2) rails (6.0.1)
actioncable (= 5.2.2) actioncable (= 6.0.1)
actionmailer (= 5.2.2) actionmailbox (= 6.0.1)
actionpack (= 5.2.2) actionmailer (= 6.0.1)
actionview (= 5.2.2) actionpack (= 6.0.1)
activejob (= 5.2.2) actiontext (= 6.0.1)
activemodel (= 5.2.2) actionview (= 6.0.1)
activerecord (= 5.2.2) activejob (= 6.0.1)
activestorage (= 5.2.2) activemodel (= 6.0.1)
activesupport (= 5.2.2) activerecord (= 6.0.1)
activestorage (= 6.0.1)
activesupport (= 6.0.1)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 5.2.2) railties (= 6.0.1)
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)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4) rails-html-sanitizer (1.3.0)
loofah (~> 2.2, >= 2.2.2) loofah (~> 2.3)
rails_12factor (0.0.3) rails_12factor (0.0.3)
rails_serve_static_assets rails_serve_static_assets
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 (5.2.2) railties (6.0.1)
actionpack (= 5.2.2) actionpack (= 6.0.1)
activesupport (= 5.2.2) activesupport (= 6.0.1)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0) thor (>= 0.20.3, < 2.0)
rainbow (3.0.0) rainbow (3.0.0)
rake (12.3.2) rake (13.0.1)
rb-readline (0.5.5) rb-readline (0.5.5)
rdoc (6.1.1) rdoc (6.2.0)
ref (2.0.0) ref (2.0.0)
responders (2.4.1) responders (3.0.0)
actionpack (>= 4.2.0, < 6.0) actionpack (>= 5.0)
railties (>= 4.2.0, < 6.0) railties (>= 5.0)
rest-client (2.0.2) rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
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)
round_robin_tournament (0.0.1) round_robin_tournament (0.0.1)
rubocop (0.67.2) rubocop (0.76.0)
jaro_winkler (~> 1.5.1) jaro_winkler (~> 1.5.1)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1) parser (>= 2.6)
psych (>= 3.1.0)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.6) unicode-display_width (>= 1.4.0, < 1.7)
ruby-progressbar (1.10.0) ruby-progressbar (1.10.1)
sdoc (1.0.0) sdoc (1.0.0)
rdoc (>= 5.0) rdoc (>= 5.0)
sinatra (2.0.5) sinatra (2.0.7)
mustermann (~> 1.0) mustermann (~> 1.0)
rack (~> 2.0) rack (~> 2.0)
rack-protection (= 2.0.5) rack-protection (= 2.0.7)
tilt (~> 2.0) tilt (~> 2.0)
spring (2.0.2) spring (2.1.0)
activesupport (>= 4.2) sprockets (4.0.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.2.1) sprockets-rails (3.2.1)
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.3.13) sqlite3 (1.4.1)
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)
@@ -246,8 +260,8 @@ GEM
ref ref
thor (0.20.3) thor (0.20.3)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.9) tilt (2.0.10)
travis (1.8.9) travis (1.8.10)
backports backports
faraday (~> 0.9) faraday (~> 0.9)
faraday_middleware (~> 0.9, >= 0.9.1) faraday_middleware (~> 0.9, >= 0.9.1)
@@ -256,28 +270,29 @@ GEM
launchy (~> 2.1) launchy (~> 2.1)
pusher-client (~> 0.4) pusher-client (~> 0.4)
typhoeus (~> 0.6, >= 0.6.8) typhoeus (~> 0.6, >= 0.6.8)
turbolinks (5.2.0) turbolinks (5.2.1)
turbolinks-source (~> 5.2) turbolinks-source (~> 5.2)
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.5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo-data (1.2019.1) tzinfo-data (1.2019.3)
tzinfo (>= 1.0.0) tzinfo (>= 1.0.0)
uglifier (4.1.20) 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.5) unf_ext (0.0.7.6)
unicode-display_width (1.5.0) unicode-display_width (1.6.0)
uniform_notifier (1.12.1) uniform_notifier (1.13.0)
warden (1.2.8) warden (1.2.8)
rack (>= 2.0.6) rack (>= 2.0.6)
websocket (1.2.8) websocket (1.2.8)
websocket-driver (0.7.0) websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3) websocket-extensions (0.1.4)
zeitwerk (2.2.1)
PLATFORMS PLATFORMS
ruby ruby
@@ -299,14 +314,14 @@ DEPENDENCIES
newrelic_rpm newrelic_rpm
passenger passenger
puma puma
rails (= 5.2.2) rails (= 6.0.1)
rails_12factor rails_12factor
rb-readline rb-readline
round_robin_tournament round_robin_tournament
rubocop rubocop
sdoc sdoc
spring spring
sqlite3 (~> 1.3, < 1.4) sqlite3
therubyracer therubyracer
travis travis
turbolinks turbolinks
@@ -317,4 +332,4 @@ RUBY VERSION
ruby 2.6.0p0 ruby 2.6.0p0
BUNDLED WITH BUNDLED WITH
1.17.2 2.0.1

View File

@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css

View File

@@ -2,11 +2,11 @@
# of editing this file, please use the migrations feature of Active Record to # of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition. # incrementally modify your database, and then regenerate this schema definition.
# #
# Note that this schema.rb definition is the authoritative source for your # This file is the source Rails uses to define your schema when running `rails
# database schema. If you need to create the application database on another # db:schema:load`. When creating a new database, `rails db:schema:load` tends to
# system, you should be using db:schema:load, not running all the migrations # be faster and is potentially less error prone than running all of your
# from scratch. The latter is a flawed and unsustainable approach (the more migrations # migrations from scratch. Old migrations may fail to apply correctly if those
# you'll amass, the slower it'll run and the greater likelihood for issues). # migrations use external dependencies or application code.
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.

View File

@@ -18,6 +18,7 @@ RUN echo "America/New_York" > /etc/timezone \
RUN echo 'gem: --no-rdoc --no-ri' > /root/.gemrc RUN echo 'gem: --no-rdoc --no-ri' > /root/.gemrc
RUN gem install bundler RUN gem install bundler
RUN gem update --system
ADD Gemfile* /tmp/ ADD Gemfile* /tmp/
WORKDIR /tmp WORKDIR /tmp
RUN bundle install --jobs 4 --without production RUN bundle install --jobs 4 --without production

View File

@@ -26,6 +26,7 @@ RUN apt-get -qq update \
RUN echo 'gem: --no-rdoc --no-ri' > /root/.gemrc RUN echo 'gem: --no-rdoc --no-ri' > /root/.gemrc
RUN gem install bundler RUN gem install bundler
RUN gem update --system
#Cache gems so they don't install on every code change #Cache gems so they don't install on every code change
RUN rm -rf /rails && mkdir /rails RUN rm -rf /rails && mkdir /rails
WORKDIR /rails WORKDIR /rails