Skip to content

Commit

Permalink
Bump rails from 5.2.4.5 to 6.0.3.6 (#798)
Browse files Browse the repository at this point in the history 
* bump rails from 5.2.4.5 to 6.0.3.6

* run "bin/rails app:update"

* update nodejs and install yarn

* remove because loading default 5.2

* create empty db/schema.rb

* update nodejs and install yarn
  • Loading branch information
@eitoball
eitoball authored Apr 16, 2021
1 parent b9eb01f commit df0afea
Show file tree
Hide file tree
Showing 26 changed files with 296 additions and 155 deletions.
9 changes: 9 additions & 0 deletions .ebextensions/yarn.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
packages:
rpm:
nodesource: https://rpm.nodesource.com/pub_10.x/el/7/x86_64/nodesource-release-el7-1.noarch.rpm
yum:
nodejs: []

commands:
install_yarn:
command: npm install --global yarn
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ log/localeapp.yml
.envrc
.direnv
.byebug_history
/node_modules

# Elastic Beanstalk Files
.elasticbeanstalk/*
Expand Down
1 change: 1 addition & 0 deletions .rubocop.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Metrics/AbcSize:
# ignore spec files because examples are in block and tend to be long
Metrics/BlockLength:
Exclude:
- 'config/environments/*.rb'
- 'spec/**/*.rb'

Layout/LineLength:
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libgeos-dev \
libproj-dev \
nodejs \
postgresql-client-11
npm \
postgresql-client-11 && \
npm install --global yarn

WORKDIR /src
ADD Gemfile Gemfile.lock .ruby-version /src/
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ source 'https://rubygems.org'

ruby '2.6.6'

gem 'rails', '~> 5.2.4.4'
gem 'rails', '~> 6.0.3.6'

gem 'activerecord-postgis-adapter', '~> 5.0'
gem 'activerecord-postgis-adapter', '~> 6.0'
gem 'aws-sdk-elasticbeanstalk'
gem 'aws-sdk-rails'
gem 'aws-sdk-s3', require: false
Expand Down Expand Up @@ -43,7 +43,7 @@ gem 'momentjs-rails', '>= 2.9.0'
gem 'newrelic_rpm'
gem 'pg'
gem 'puma'
gem 'rails_admin', '~>1.4.2'
gem 'rails_admin', '~> 2.0.0'
gem 'rakismet'
gem 'responders'
gem 'sass-rails', '~>5.0'
Expand Down
163 changes: 89 additions & 74 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,57 +1,70 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.4.5)
actionpack (= 5.2.4.5)
actioncable (6.0.3.6)
actionpack (= 6.0.3.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.4.5)
actionpack (= 5.2.4.5)
actionview (= 5.2.4.5)
activejob (= 5.2.4.5)
actionmailbox (6.0.3.6)
actionpack (= 6.0.3.6)
activejob (= 6.0.3.6)
activerecord (= 6.0.3.6)
activestorage (= 6.0.3.6)
activesupport (= 6.0.3.6)
mail (>= 2.7.1)
actionmailer (6.0.3.6)
actionpack (= 6.0.3.6)
actionview (= 6.0.3.6)
activejob (= 6.0.3.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.4.5)
actionview (= 5.2.4.5)
activesupport (= 5.2.4.5)
actionpack (6.0.3.6)
actionview (= 6.0.3.6)
activesupport (= 6.0.3.6)
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.4.5)
activesupport (= 5.2.4.5)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.3.6)
actionpack (= 6.0.3.6)
activerecord (= 6.0.3.6)
activestorage (= 6.0.3.6)
activesupport (= 6.0.3.6)
nokogiri (>= 1.8.5)
actionview (6.0.3.6)
activesupport (= 6.0.3.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.4.5)
activesupport (= 5.2.4.5)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.3.6)
activesupport (= 6.0.3.6)
globalid (>= 0.3.6)
activemodel (5.2.4.5)
activesupport (= 5.2.4.5)
activemodel (6.0.3.6)
activesupport (= 6.0.3.6)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (5.2.4.5)
activemodel (= 5.2.4.5)
activesupport (= 5.2.4.5)
arel (>= 9.0)
activerecord-postgis-adapter (5.2.2)
activerecord (~> 5.1)
activerecord (6.0.3.6)
activemodel (= 6.0.3.6)
activesupport (= 6.0.3.6)
activerecord-postgis-adapter (6.0.2)
activerecord (~> 6.0.0)
rgeo-activerecord (~> 6.0)
activestorage (5.2.4.5)
actionpack (= 5.2.4.5)
activerecord (= 5.2.4.5)
marcel (~> 0.3.1)
activesupport (5.2.4.5)
activestorage (6.0.3.6)
actionpack (= 6.0.3.6)
activejob (= 6.0.3.6)
activerecord (= 6.0.3.6)
marcel (~> 1.0.0)
activesupport (6.0.3.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (9.0.0)
ast (2.4.1)
autoprefixer-rails (10.2.4.0)
execjs
Expand Down Expand Up @@ -111,9 +124,9 @@ GEM
codeclimate-test-reporter (1.0.9)
simplecov (<= 0.13)
coderay (1.1.2)
coffee-rails (4.2.2)
coffee-rails (5.0.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0)
railties (>= 5.2.0)
coffee-script (2.4.1)
coffee-script-source
execjs
Expand Down Expand Up @@ -181,9 +194,9 @@ GEM
fabrication (2.21.1)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.12.2)
ffi (1.12.2-x64-mingw32)
ffi (1.12.2-x86-mingw32)
ffi (1.15.0)
ffi (1.15.0-x64-mingw32)
ffi (1.15.0-x86-mingw32)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
Expand All @@ -202,15 +215,13 @@ GEM
fog-xml (0.1.3)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
font-awesome-rails (4.7.0.5)
railties (>= 3.2, < 6.1)
formatador (0.2.5)
formatted-dates (0.1.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
groupdate (5.2.2)
activesupport (>= 5)
haml (5.1.2)
haml (5.2.1)
temple (>= 0.8.0)
tilt
has_scope (0.7.2)
Expand All @@ -229,13 +240,13 @@ GEM
http-form_data (2.3.0)
http-parser (1.2.1)
ffi-compiler (>= 1.0, < 2.0)
i18n (1.8.9)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
ipaddress (0.8.3)
jbuilder (2.10.0)
activesupport (>= 5.0.0)
jmespath (1.4.0)
jquery-rails (4.3.5)
jquery-rails (4.4.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand Down Expand Up @@ -264,17 +275,13 @@ GEM
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
marcel (1.0.1)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2020.1104)
mimemagic (0.3.9)
nokogiri (~> 1)
rake
mini_magick (4.11.0)
mini_mime (1.0.2)
mini_mime (1.0.3)
mini_portile2 (2.5.0)
minitest (5.14.4)
momentjs-rails (2.20.1)
Expand All @@ -286,13 +293,13 @@ GEM
multipart-post (2.1.1)
nested_form (0.3.2)
newrelic_rpm (6.10.0.364)
nio4r (2.5.5)
nokogiri (1.11.1)
nio4r (2.5.7)
nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogiri (1.11.1-x64-mingw32)
nokogiri (1.11.2-x64-mingw32)
racc (~> 1.4)
nokogiri (1.11.1-x86-mingw32)
nokogiri (1.11.2-x86-mingw32)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.20.1)
Expand All @@ -319,18 +326,20 @@ GEM
rack (>= 1.1)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.4.5)
actioncable (= 5.2.4.5)
actionmailer (= 5.2.4.5)
actionpack (= 5.2.4.5)
actionview (= 5.2.4.5)
activejob (= 5.2.4.5)
activemodel (= 5.2.4.5)
activerecord (= 5.2.4.5)
activestorage (= 5.2.4.5)
activesupport (= 5.2.4.5)
rails (6.0.3.6)
actioncable (= 6.0.3.6)
actionmailbox (= 6.0.3.6)
actionmailer (= 6.0.3.6)
actionpack (= 6.0.3.6)
actiontext (= 6.0.3.6)
actionview (= 6.0.3.6)
activejob (= 6.0.3.6)
activemodel (= 6.0.3.6)
activerecord (= 6.0.3.6)
activestorage (= 6.0.3.6)
activesupport (= 6.0.3.6)
bundler (>= 1.3.0)
railties (= 5.2.4.5)
railties (= 6.0.3.6)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.4)
actionpack (>= 5.0.1.x)
Expand All @@ -341,25 +350,24 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails_admin (1.4.3)
rails_admin (2.0.2)
activemodel-serializers-xml (>= 1.0)
builder (~> 3.1)
coffee-rails (~> 4.0)
font-awesome-rails (>= 3.0, < 5)
haml (>= 4.0, < 6)
jquery-rails (>= 3.0, < 5)
jquery-ui-rails (>= 5.0, < 7)
kaminari (>= 0.14, < 2.0)
nested_form (~> 0.3)
rack-pjax (>= 0.7)
rails (>= 4.0, < 6)
rails (>= 5.0, < 7)
remotipart (~> 1.3)
sass-rails (>= 4.0, < 6)
railties (5.2.4.5)
actionpack (= 5.2.4.5)
activesupport (= 5.2.4.5)
sassc-rails (>= 1.3, < 3)
railties (6.0.3.6)
actionpack (= 6.0.3.6)
activesupport (= 6.0.3.6)
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.3)
rakismet (1.5.4)
Expand All @@ -374,8 +382,8 @@ GEM
actionpack (>= 5.0)
railties (>= 5.0)
rexml (3.2.4)
rgeo (2.1.1)
rgeo-activerecord (6.2.1)
rgeo (2.2.0)
rgeo-activerecord (6.2.2)
activerecord (>= 5.0)
rgeo (>= 1.0.0)
rspec-core (3.10.1)
Expand Down Expand Up @@ -433,6 +441,12 @@ GEM
ffi (~> 1.9)
sassc (2.4.0-x64-mingw32)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
simple_form (5.0.2)
actionpack (>= 5.0)
activemodel (>= 5.0)
Expand Down Expand Up @@ -484,14 +498,15 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.4.2)

PLATFORMS
ruby
x64-mingw32
x86-mingw32

DEPENDENCIES
activerecord-postgis-adapter (~> 5.0)
activerecord-postgis-adapter (~> 6.0)
aws-sdk-elasticbeanstalk
aws-sdk-rails
aws-sdk-s3
Expand Down Expand Up @@ -536,9 +551,9 @@ DEPENDENCIES
pry-byebug
pry-rails
puma
rails (~> 5.2.4.4)
rails (~> 6.0.3.6)
rails-controller-testing
rails_admin (~> 1.4.2)
rails_admin (~> 2.0.0)
rakismet
responders
rspec-its
Expand Down
5 changes: 0 additions & 5 deletions bin/rails
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
#!/usr/bin/env ruby
begin
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
APP_PATH = File.expand_path('../config/application', __dir__)
require_relative '../config/boot'
require 'rails/commands'
5 changes: 0 additions & 5 deletions bin/rake
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
#!/usr/bin/env ruby
begin
load File.expand_path('spring', __dir__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
require_relative '../config/boot'
require 'rake'
Rake.application.run
Loading

0 comments on commit df0afea

Please sign in to comment.