Skip to content
This repository has been archived by the owner on Nov 23, 2022. It is now read-only.

Upgrade to Rails 6 #725

Merged
merged 29 commits into from
Oct 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e0f6f02
Bump gems to Rails 6
iHiD Sep 21, 2019
9a17f91
Run rails app:update
iHiD Sep 21, 2019
80c71c1
Remove flux services
iHiD Sep 21, 2019
879b1c5
Expliclty set case_sensitive flag on uniquness validator
iHiD Sep 21, 2019
cbf6462
Use version of friendly_id that supports finders on rails 6
iHiD Sep 21, 2019
d2cf773
Add new framework defaults
iHiD Sep 22, 2019
49e22e5
Remove autoloading deprecation warning
kntsoriano Oct 16, 2019
d9ec230
Rename classes for autoloading compliance
kntsoriano Oct 16, 2019
169ba09
Don't purge avatar when validations fail
kntsoriano Oct 16, 2019
d87a590
Remove deprecation warning for 404 page rendering
kntsoriano Oct 16, 2019
4998e87
Refactor selenium helpers for compliance with Rails custom config
kntsoriano Oct 16, 2019
32d9583
Remove update_attributes deprecation error
kntsoriano Oct 16, 2019
f5ed14d
Add lvh.me to permitted hosts in development
kntsoriano Oct 16, 2019
0aa2ba0
Refactor profile page to remove deprecation error
kntsoriano Oct 16, 2019
9dbeeea
Remove unused file
kntsoriano Oct 16, 2019
9f075d3
Migrate coffee script files to remove deprecation errors
kntsoriano Oct 16, 2019
e6a0175
Merge branch 'master' into rails-6
kntsoriano Oct 16, 2019
d6b6dd1
Update ruby version to 2.6.3
kntsoriano Oct 16, 2019
85a8394
Change twitter_accounts.yml to support new structure of config files
kntsoriano Oct 16, 2019
31b80b1
Add SQL and HTML acronym
kntsoriano Oct 17, 2019
8ac60d8
Merge branch 'master' into rails-6
kntsoriano Oct 17, 2019
30b7b9e
Add webpacker
kntsoriano Oct 17, 2019
0f8a41c
Move to Rails 6 framework defaults
kntsoriano Oct 21, 2019
f7941f7
Copy packs folder to S3
kntsoriano Oct 21, 2019
1014a0d
Bump gems
iHiD Oct 21, 2019
06a90ec
Merge branch 'master' into rails-6
kntsoriano Oct 22, 2019
10158f5
Move Prism out of HEAD
iHiD Oct 21, 2019
ade6ca1
Move to Font Awesome Kit
iHiD Oct 21, 2019
4e71154
Convert all icons to FA-5
iHiD Oct 21, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,10 @@ dump.sql
dump.sql.gz

config/secrets.yml

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.4
2.6.3
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,19 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

gem 'rails', '~> 5.2'
gem 'rails', '~> 6.0.0'
gem 'puma', '~> 3.7'
gem 'mysql2'

gem 'dalli'
gem 'devise', ">= 4.7.1"
gem 'omniauth-github'
gem 'kaminari'
gem 'friendly_id', '~> 5.2'
gem 'friendly_id', github: 'norman/friendly_id', branch: 'master', ref: 'cdd5971f91c40e0c05e5afb498d2ec1b452ffb44'
gem 'mandate'

gem 'haml-rails'
gem 'jquery-rails'
gem 'coffee-rails', '~> 4.2'
gem 'sassc-rails'
gem 'uglifier', '>= 1.3.0'
gem 'premailer-rails'
Expand Down Expand Up @@ -51,6 +50,8 @@ gem 'flipper-ui'

gem 'twitter', require: false

gem 'webpacker', '~> 4.0'

group :production do
gem "skylight"
end
Expand Down
166 changes: 94 additions & 72 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,66 +1,88 @@
GIT
remote: https://github.com/norman/friendly_id.git
revision: cdd5971f91c40e0c05e5afb498d2ec1b452ffb44
ref: cdd5971f91c40e0c05e5afb498d2ec1b452ffb44
branch: master
specs:
friendly_id (5.2.5)
activerecord (>= 4.0.0)

GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.3)
actionpack (= 5.2.3)
actioncable (6.0.0)
actionpack (= 6.0.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
actionmailbox (6.0.0)
actionpack (= 6.0.0)
activejob (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
mail (>= 2.7.1)
actionmailer (6.0.0)
actionpack (= 6.0.0)
actionview (= 6.0.0)
activejob (= 6.0.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.3)
actionview (= 5.2.3)
activesupport (= 5.2.3)
actionpack (6.0.0)
actionview (= 6.0.0)
activesupport (= 6.0.0)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.3)
activesupport (= 5.2.3)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.0)
actionpack (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
nokogiri (>= 1.8.5)
actionview (6.0.0)
activesupport (= 6.0.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.3)
activesupport (= 5.2.3)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.0)
activesupport (= 6.0.0)
globalid (>= 0.3.6)
activemodel (5.2.3)
activesupport (= 5.2.3)
activerecord (5.2.3)
activemodel (= 5.2.3)
activesupport (= 5.2.3)
arel (>= 9.0)
activestorage (5.2.3)
actionpack (= 5.2.3)
activerecord (= 5.2.3)
activemodel (6.0.0)
activesupport (= 6.0.0)
activerecord (6.0.0)
activemodel (= 6.0.0)
activesupport (= 6.0.0)
activestorage (6.0.0)
actionpack (= 6.0.0)
activejob (= 6.0.0)
activerecord (= 6.0.0)
marcel (~> 0.3.1)
activesupport (5.2.3)
activesupport (6.0.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.1, >= 2.1.8)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
airbrussh (1.3.4)
airbrussh (1.4.0)
sshkit (>= 1.6.1, != 1.7.0)
archive-zip (0.12.0)
io-like (~> 0.3.0)
arel (9.0.0)
ast (2.4.0)
aws-eventstream (1.0.3)
aws-partitions (1.220.0)
aws-sdk-core (3.68.1)
aws-partitions (1.226.0)
aws-sdk-core (3.69.1)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.24.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.48.0)
aws-sdk-s3 (1.50.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
Expand Down Expand Up @@ -113,19 +135,12 @@ GEM
chromedriver-helper (2.1.1)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
railties (>= 4.0.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
commonmarker (0.20.1)
ruby-enum (~> 0.5)
concurrent-ruby (1.1.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
crass (1.0.5)
css_parser (1.7.0)
addressable
daemons (1.3.1)
Expand Down Expand Up @@ -153,7 +168,7 @@ GEM
factory_bot_rails (5.1.1)
factory_bot (~> 5.1.0)
railties (>= 4.2.0)
faraday (0.16.2)
faraday (0.17.0)
multipart-post (>= 1.2, < 3)
ffi (1.11.1)
flipper (0.17.1)
Expand All @@ -165,8 +180,6 @@ GEM
flipper (~> 0.17.1)
rack (>= 1.4, < 3)
rack-protection (>= 1.5.3, < 2.1.0)
friendly_id (5.3.0)
activerecord (>= 4.0.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
haml (5.1.2)
Expand Down Expand Up @@ -257,7 +270,7 @@ GEM
method_source (0.9.2)
mime-types (3.3)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0904)
mime-types-data (3.2019.1009)
mimemagic (0.3.3)
mini_magick (4.9.5)
mini_mime (1.0.2)
Expand All @@ -267,7 +280,7 @@ GEM
mocha (1.9.0)
metaclass (~> 0.0.1)
msgpack (1.3.1)
multi_json (1.13.1)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.1.1)
mysql2 (0.5.2)
Expand Down Expand Up @@ -315,20 +328,24 @@ GEM
rack (2.0.7)
rack-protection (2.0.7)
rack
rack-proxy (0.6.5)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.3)
actioncable (= 5.2.3)
actionmailer (= 5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
activemodel (= 5.2.3)
activerecord (= 5.2.3)
activestorage (= 5.2.3)
activesupport (= 5.2.3)
rails (6.0.0)
actioncable (= 6.0.0)
actionmailbox (= 6.0.0)
actionmailer (= 6.0.0)
actionpack (= 6.0.0)
actiontext (= 6.0.0)
actionview (= 6.0.0)
activejob (= 6.0.0)
activemodel (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
bundler (>= 1.3.0)
railties (= 5.2.3)
railties (= 6.0.0)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.4)
actionpack (>= 5.0.1.x)
Expand All @@ -337,20 +354,20 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.0.0)
actionpack (= 6.0.0)
activesupport (= 6.0.0)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
thor (>= 0.20.3, < 2.0)
rainbow (3.0.0)
rake (13.0.0)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
recaptcha (5.1.1)
recaptcha (5.2.1)
json
regexp_parser (1.6.0)
request_store (1.4.1)
Expand All @@ -363,7 +380,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rubocop (0.75.0)
rubocop (0.75.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
Expand All @@ -373,7 +390,7 @@ GEM
ruby-enum (0.7.2)
i18n
ruby-progressbar (1.10.1)
ruby-vips (2.0.15)
ruby-vips (2.0.16)
ffi (~> 1.9)
ruby_dep (1.5.0)
ruby_parser (3.14.0)
Expand Down Expand Up @@ -410,7 +427,7 @@ GEM
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.2)
sprockets (4.0.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
Expand Down Expand Up @@ -445,23 +462,28 @@ GEM
unf_ext
unf_ext (0.0.7.6)
unicode-display_width (1.6.0)
uniform_notifier (1.12.1)
uniform_notifier (1.13.0)
warden (1.2.8)
rack (>= 2.0.6)
web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
web-console (4.0.1)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 5.0)
railties (>= 6.0.0)
webmock (3.7.6)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webpacker (4.0.7)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.2.0)

PLATFORMS
ruby
Expand All @@ -479,7 +501,6 @@ DEPENDENCIES
capistrano-yarn
capybara (~> 3.0)
chromedriver-helper
coffee-rails (~> 4.2)
commonmarker
daemons
dalli
Expand All @@ -489,7 +510,7 @@ DEPENDENCIES
flipper
flipper-active_record
flipper-ui
friendly_id (~> 5.2)
friendly_id!
haml-lint
haml-rails
image_processing (~> 1.2)
Expand All @@ -510,7 +531,7 @@ DEPENDENCIES
premailer-rails
propono
puma (~> 3.7)
rails (~> 5.2)
rails (~> 6.0.0)
rails-controller-testing
recaptcha
rest-client
Expand All @@ -528,6 +549,7 @@ DEPENDENCIES
uglifier (>= 1.3.0)
web-console (>= 3.3.0)
webmock
webpacker (~> 4.0)

BUNDLED WITH
2.0.2
1 change: 0 additions & 1 deletion app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
Loading