Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Rails 6 + Webpacker 5 #493

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade to Rails 6 + Webpacker 5 #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion config/application.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

module Ecosystem
class Application < Rails::Application
config.load_defaults 5.2
config.load_defaults 6.0

# Settings in config/environments/* take precedence over those specified here.
# Application configuration can go into files in config/initializers
Expand Down
27 changes: 11 additions & 16 deletions db/schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,38 @@
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
#
# Note that this schema.rb definition is the authoritative source for your
# database schema. If you need to create the application database on another
# system, you should be using db:schema:load, not running all the migrations
# from scratch. The latter is a flawed and unsustainable approach (the more migrations
# you'll amass, the slower it'll run and the greater likelihood for issues).
# This file is the source Rails uses to define your schema when running `rails
# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
# be faster and is potentially less error prone than running all of your
# migrations from scratch. Old migrations may fail to apply correctly if those
# migrations use external dependencies or application code.
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 2019_07_13_153752) do

# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
enable_extension "plpgsql"

create_table "import_statuses",
id: :uuid,
default: -> { "gen_random_uuid()" },
force: :cascade do |t|
create_table "import_statuses", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
t.string "key", null: false
t.date "date", null: false
t.datetime "imported_at"
t.jsonb "data"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index %w[key], name: "index_import_statuses_on_key"
t.index ["key"], name: "index_import_statuses_on_key"
end

create_table "stats",
id: :uuid,
default: -> { "gen_random_uuid()" },
force: :cascade do |t|
create_table "stats", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
t.date "date", null: false
t.string "key", null: false
t.string "value", null: false
t.integer "count", default: 0, null: false
t.datetime "created_at"
t.datetime "updated_at"
t.index %w[date key value],
name: "index_stats_on_date_and_key_and_value", unique: true
t.index ["date", "key", "value"], name: "index_stats_on_date_and_key_and_value", unique: true
end

end
176 changes: 95 additions & 81 deletions gems.locked
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,50 +9,63 @@ GEM
remote: https://rubygems.org/
remote: https://gems.contribsys.com/
specs:
actioncable (5.2.3)
actionpack (= 5.2.3)
actioncable (6.0.4.8)
actionpack (= 6.0.4.8)
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.4.8)
actionpack (= 6.0.4.8)
activejob (= 6.0.4.8)
activerecord (= 6.0.4.8)
activestorage (= 6.0.4.8)
activesupport (= 6.0.4.8)
mail (>= 2.7.1)
actionmailer (6.0.4.8)
actionpack (= 6.0.4.8)
actionview (= 6.0.4.8)
activejob (= 6.0.4.8)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.3)
actionview (= 5.2.3)
activesupport (= 5.2.3)
rack (~> 2.0)
actionpack (6.0.4.8)
actionview (= 6.0.4.8)
activesupport (= 6.0.4.8)
rack (~> 2.0, >= 2.0.8)
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.4.8)
actionpack (= 6.0.4.8)
activerecord (= 6.0.4.8)
activestorage (= 6.0.4.8)
activesupport (= 6.0.4.8)
nokogiri (>= 1.8.5)
actionview (6.0.4.8)
activesupport (= 6.0.4.8)
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.4.8)
activesupport (= 6.0.4.8)
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)
marcel (~> 0.3.1)
activesupport (5.2.3)
activemodel (6.0.4.8)
activesupport (= 6.0.4.8)
activerecord (6.0.4.8)
activemodel (= 6.0.4.8)
activesupport (= 6.0.4.8)
activestorage (6.0.4.8)
actionpack (= 6.0.4.8)
activejob (= 6.0.4.8)
activerecord (= 6.0.4.8)
marcel (~> 1.0.0)
activesupport (6.0.4.8)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
apexcharts (0.1.5)
smart_kv (= 0.2.7)
arel (9.0.0)
aws-eventstream (1.0.3)
aws-partitions (1.193.0)
aws-sdk-core (3.61.1)
Expand All @@ -72,19 +85,19 @@ GEM
bindex (0.5.0)
bootsnap (1.4.6)
msgpack (~> 1.0)
builder (3.2.3)
builder (3.2.4)
byebug (11.0.0)
coderay (1.1.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.10)
connection_pool (2.2.2)
crass (1.0.4)
crass (1.0.6)
diff-lcs (1.3)
erubi (1.8.0)
erubi (1.10.0)
ffi (1.15.4)
globalid (0.4.2)
activesupport (>= 4.2.0)
globalid (1.0.0)
activesupport (>= 5.0)
honeybadger (4.11.0)
i18n (1.6.0)
i18n (1.10.0)
concurrent-ruby (~> 1.0)
jmespath (1.4.0)
listen (3.1.5)
Expand All @@ -96,26 +109,22 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.2.3)
loofah (2.17.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
marcel (1.0.2)
method_source (0.9.2)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_mime (1.0.2)
mini_portile2 (2.6.1)
minitest (5.11.3)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.15.0)
msgpack (1.3.3)
nio4r (2.5.4)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
nio4r (2.5.8)
nokogiri (1.13.4)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.12.5-x86_64-darwin)
nokogiri (1.13.4-x86_64-darwin)
racc (~> 1.4)
pg (1.1.4)
pry (0.12.2)
Expand All @@ -129,38 +138,40 @@ GEM
puma (4.3.6)
nio4r (~> 2.0)
racc (1.6.0)
rack (2.0.8)
rack (2.2.3)
rack-protection (2.0.7)
rack
rack-proxy (0.6.5)
rack-proxy (0.7.2)
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.4.8)
actioncable (= 6.0.4.8)
actionmailbox (= 6.0.4.8)
actionmailer (= 6.0.4.8)
actionpack (= 6.0.4.8)
actiontext (= 6.0.4.8)
actionview (= 6.0.4.8)
activejob (= 6.0.4.8)
activemodel (= 6.0.4.8)
activerecord (= 6.0.4.8)
activestorage (= 6.0.4.8)
activesupport (= 6.0.4.8)
bundler (>= 1.3.0)
railties (= 5.2.3)
railties (= 6.0.4.8)
sprockets-rails (>= 2.0.0)
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.4.2)
loofah (~> 2.3)
railties (6.0.4.8)
actionpack (= 6.0.4.8)
activesupport (= 6.0.4.8)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.3)
thor (>= 0.20.3, < 2.0)
rake (13.0.6)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
Expand All @@ -185,6 +196,7 @@ GEM
rspec-support (~> 3.8.0)
rspec-support (3.8.2)
ruby_dep (1.5.0)
semantic_range (3.0.0)
sidekiq (5.2.7)
connection_pool (~> 2.2, >= 2.2.2)
rack (>= 1.5.0)
Expand All @@ -194,29 +206,31 @@ GEM
concurrent-ruby (>= 1.0.5)
sidekiq (>= 5.2.1)
smart_kv (0.2.7)
sprockets (3.7.2)
sprockets (4.0.3)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
thor (0.20.3)
thor (1.2.1)
thread_safe (0.3.6)
tzinfo (1.2.5)
tzinfo (1.2.9)
thread_safe (~> 0.1)
web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
webpacker (4.0.7)
activesupport (>= 4.2)
webpacker (5.4.3)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
websocket-driver (0.7.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
websocket-extensions (0.1.5)
zeitwerk (2.5.4)

PLATFORMS
ruby
Expand All @@ -238,13 +252,13 @@ DEPENDENCIES
puma (~> 4.1)
rack
rack-protection
rails (~> 5.2.3)
rails (~> 6.0.0)
redis
rspec-rails (~> 3.8)
sidekiq (~> 5.2)
sidekiq-pro!
web-console (>= 3.3.0)
webpacker (~> 4.0)
webpacker (~> 5.0)

RUBY VERSION
ruby 2.7.5p203
Expand Down
4 changes: 2 additions & 2 deletions gems.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ruby Pathname.new(".ruby-version").expand_path(__dir__).read

gem "rails", "~> 5.2.3"
gem "rails", "~> 6.0.0"

gem "apexcharts"
gem "aws-sdk-s3", "~> 1.46"
Expand All @@ -14,7 +14,7 @@
gem "pg", ">= 0.18", "< 2.0"
gem "puma", "~> 4.1"
gem "sidekiq", "~> 5.2"
gem "webpacker", "~> 4.0"
gem "webpacker", "~> 5.0"

# Gems in both rubygems.org and gems.contribsys.com
gem "redis"
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ecosystem",
"private": true,
"dependencies": {
"@rails/webpacker": "^4.0.7",
"@rails/webpacker": "^5.0.0",
"apexcharts": "^3.8.4",
"cssnext": "^1.8.4",
"jquery": "^3.3.1",
Expand All @@ -23,6 +23,6 @@
"webpack-dev-server": "^3.8.1"
},
"engines": {
"node": "14.x"
"node": "18.x"
}
}
Loading