Skip to content

Commit

Permalink
Upgrade Rails 5.1 -> 5.2 (#574)
Browse files Browse the repository at this point in the history 
* Upgrade Rails 5.1 -> 5.2
  • Loading branch information
Vladimir Bazhanov authored Jun 9, 2020
1 parent e7ac831 commit c364f1f
Show file tree
Hide file tree
Showing 21 changed files with 229 additions and 123 deletions.
6 changes: 3 additions & 3 deletions .semaphore/semaphore.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ blocks:
commands:
- bin/rspec --tag type:feature

- name: Jasmine
commands:
- bundle exec rails jasmine:ci
# - name: Jasmine
# commands:
# - bundle exec rails jasmine:ci

promotions:
- name: Deploy to Heroku
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Change Log

## Unreleased
- Updated Rails version to 5.2.4.3
- Updated most important gems (pundit, draper etc) to fresh versions
- Updated rack-mini-profiler to version 1.1.3
- Ruby updated to version 2.5.7
- Replace gem [metamagic](https://github.com/lassebunk/metamagic) to [meta-tags](https://github.com/kpumuk/meta-tags). Using for CEO.
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source "https://rubygems.org"
ruby "2.5.7"

gem "pg"
gem "rails", "5.1.6.2"
gem "rails", "5.2.4.3"

# assets
gem "autoprefixer-rails"
Expand All @@ -27,6 +27,7 @@ gem "simple_form"
gem "slim"

# all other gems
gem "bootsnap"
gem "decent_decoration"
gem "decent_exposure"
gem "devise"
Expand Down
176 changes: 94 additions & 82 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,54 +9,57 @@ GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
specs:
actioncable (5.1.6.2)
actionpack (= 5.1.6.2)
actioncable (5.2.4.3)
actionpack (= 5.2.4.3)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.6.2)
actionpack (= 5.1.6.2)
actionview (= 5.1.6.2)
activejob (= 5.1.6.2)
websocket-driver (>= 0.6.1)
actionmailer (5.2.4.3)
actionpack (= 5.2.4.3)
actionview (= 5.2.4.3)
activejob (= 5.2.4.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.6.2)
actionview (= 5.1.6.2)
activesupport (= 5.1.6.2)
rack (~> 2.0)
actionpack (5.2.4.3)
actionview (= 5.2.4.3)
activesupport (= 5.2.4.3)
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.1.6.2)
activesupport (= 5.1.6.2)
actionview (5.2.4.3)
activesupport (= 5.2.4.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_link_to (1.0.5)
actionpack
addressable
activejob (5.1.6.2)
activesupport (= 5.1.6.2)
activejob (5.2.4.3)
activesupport (= 5.2.4.3)
globalid (>= 0.3.6)
activemodel (5.1.6.2)
activesupport (= 5.1.6.2)
activemodel-serializers-xml (1.0.1)
activemodel (5.2.4.3)
activesupport (= 5.2.4.3)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activerecord (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (5.1.6.2)
activemodel (= 5.1.6.2)
activesupport (= 5.1.6.2)
arel (~> 8.0)
activesupport (5.1.6.2)
activerecord (5.2.4.3)
activemodel (= 5.2.4.3)
activesupport (= 5.2.4.3)
arel (>= 9.0)
activestorage (5.2.4.3)
actionpack (= 5.2.4.3)
activerecord (= 5.2.4.3)
marcel (~> 0.3.1)
activesupport (5.2.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (8.0.0)
arel (9.0.0)
ast (2.4.0)
autoprefixer-rails (6.7.4)
execjs
Expand All @@ -67,13 +70,15 @@ GEM
execjs (~> 2.0)
bcrypt (3.1.13)
bindex (0.8.1)
bootsnap (1.4.6)
msgpack (~> 1.0)
brakeman (3.7.0)
builder (3.2.3)
bullet (5.6.1)
builder (3.2.4)
bullet (6.1.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.10.0)
bundler-audit (0.5.0)
bundler (~> 1.2)
uniform_notifier (~> 1.11)
bundler-audit (0.6.1)
bundler (>= 1.2.0, < 3)
thor (~> 0.18)
byebug (9.0.6)
capybara (2.12.1)
Expand All @@ -88,9 +93,9 @@ GEM
codeclimate-test-reporter (0.6.0)
simplecov (>= 0.7.1, < 1.0.0)
coderay (1.1.1)
coffee-rails (4.2.1)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.2.x)
railties (>= 4.0.0)
coffee-script (2.4.1)
coffee-script-source
execjs
Expand All @@ -99,10 +104,10 @@ GEM
coffee-script
execjs
json
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.5)
crass (1.0.6)
css_parser (1.4.9)
addressable
database_cleaner (1.6.1)
Expand All @@ -118,26 +123,26 @@ GEM
warden (~> 1.2.3)
diff-lcs (1.3)
docile (1.1.5)
dotenv (2.2.1)
dotenv-rails (2.2.1)
dotenv (= 2.2.1)
railties (>= 3.2, < 5.2)
draper (3.0.0)
actionpack (~> 5.0)
activemodel (~> 5.0)
activemodel-serializers-xml (~> 1.0)
activesupport (~> 5.0)
request_store (~> 1.0)
dotenv (2.7.5)
dotenv-rails (2.7.5)
dotenv (= 2.7.5)
railties (>= 3.2, < 6.1)
draper (4.0.1)
actionpack (>= 5.0)
activemodel (>= 5.0)
activemodel-serializers-xml (>= 1.0)
activesupport (>= 5.0)
request_store (>= 1.0)
email_spec (2.1.0)
htmlentities (~> 4.3.3)
launchy (~> 2.1)
mail (~> 2.6.3)
erubi (1.9.0)
execjs (2.7.0)
factory_bot (5.1.1)
factory_bot (5.2.0)
activesupport (>= 4.2.0)
factory_bot_rails (5.1.1)
factory_bot (~> 5.1.0)
factory_bot_rails (5.2.0)
factory_bot (~> 5.2.0)
railties (>= 4.2.0)
faker (1.7.3)
i18n (~> 0.5)
Expand Down Expand Up @@ -183,12 +188,12 @@ GEM
foundation_emails (~> 2)
nokogiri
interactor (3.1.0)
jasmine (2.5.2)
jasmine-core (>= 2.5.1, < 3.0.0)
jasmine (3.5.1)
jasmine-core (~> 3.5.0)
phantomjs
rack (>= 1.2.1)
rake
jasmine-core (2.5.2)
jasmine-core (3.5.0)
jasmine-jquery-rails (2.0.3)
json (2.0.3)
kaminari (1.0.1)
Expand All @@ -211,26 +216,30 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.4.0)
loofah (2.5.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.11)
mail (2.6.6)
mime-types (>= 1.16, < 4)
marcel (0.3.3)
mimemagic (~> 0.3.2)
memory_profiler (0.9.7)
meta-tags (2.4.1)
actionpack (>= 3.2.0, < 5.2)
meta-tags (2.13.0)
actionpack (>= 3.2.0, < 6.1)
method_source (0.8.2)
mime-types (3.3)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0904)
mime-types-data (3.2020.0512)
mimemagic (0.3.5)
mini_portile2 (2.4.0)
minitest (5.12.2)
minitest (5.14.1)
msgpack (1.3.3)
multi_json (1.12.1)
nenv (0.3.0)
newrelic_rpm (3.18.1.330)
nio4r (2.3.1)
nokogiri (1.10.7)
nio4r (2.5.2)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
notiffany (0.1.1)
nenv (~> 0.1)
Expand Down Expand Up @@ -260,23 +269,24 @@ GEM
puma (3.12.2)
pundit (1.1.0)
activesupport (>= 3.0.0)
rack (2.0.8)
rack (2.2.2)
rack-canonical-host (0.2.2)
addressable (> 0, < 3)
rack (>= 1.0.0, < 3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.1.6.2)
actioncable (= 5.1.6.2)
actionmailer (= 5.1.6.2)
actionpack (= 5.1.6.2)
actionview (= 5.1.6.2)
activejob (= 5.1.6.2)
activemodel (= 5.1.6.2)
activerecord (= 5.1.6.2)
activesupport (= 5.1.6.2)
rails (5.2.4.3)
actioncable (= 5.2.4.3)
actionmailer (= 5.2.4.3)
actionpack (= 5.2.4.3)
actionview (= 5.2.4.3)
activejob (= 5.2.4.3)
activemodel (= 5.2.4.3)
activerecord (= 5.2.4.3)
activestorage (= 5.2.4.3)
activesupport (= 5.2.4.3)
bundler (>= 1.3.0)
railties (= 5.1.6.2)
railties (= 5.2.4.3)
sprockets-rails (>= 2.0.0)
rails-assets-jquery (3.1.1)
rails-assets-jquery-ujs (1.2.2)
Expand All @@ -292,19 +302,20 @@ GEM
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.1.6.2)
actionpack (= 5.1.6.2)
activesupport (= 5.1.6.2)
railties (5.2.4.3)
actionpack (= 5.2.4.3)
activesupport (= 5.2.4.3)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
thor (>= 0.19.0, < 2.0)
rainbow (2.2.2)
rake
rake (12.3.3)
rb-fsevent (0.9.8)
rb-inotify (0.9.8)
ffi (>= 0.5.0)
request_store (1.3.2)
request_store (1.5.0)
rack (>= 1.4)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
Expand Down Expand Up @@ -373,10 +384,10 @@ GEM
slim (3.0.9)
temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1)
slim-rails (3.1.1)
slim-rails (3.2.0)
actionpack (>= 3.1)
railties (>= 3.1)
slim (~> 3.0)
slim (>= 3.0, < 5.0)
slim_lint (0.11.0)
rake (>= 10, < 13)
rubocop (>= 0.47.0)
Expand Down Expand Up @@ -408,12 +419,12 @@ GEM
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.10)
tzinfo (1.2.5)
tzinfo (1.2.7)
thread_safe (~> 0.1)
uglifier (3.0.4)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.3.0)
uniform_notifier (1.10.0)
uniform_notifier (1.13.0)
warden (1.2.8)
rack (>= 2.0.6)
web-console (3.7.0)
Expand All @@ -425,9 +436,9 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
websocket-driver (0.6.5)
websocket-driver (0.7.2)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
websocket-extensions (0.1.5)
xpath (2.1.0)
nokogiri (~> 1.3)

Expand All @@ -438,6 +449,7 @@ DEPENDENCIES
active_link_to
autoprefixer-rails
awesome_print
bootsnap
brakeman
bullet
bundler-audit
Expand Down Expand Up @@ -479,7 +491,7 @@ DEPENDENCIES
pundit
rack-canonical-host
rack-mini-profiler!
rails (= 5.1.6.2)
rails (= 5.2.4.3)
rails-assets-jquery-ujs!
rails-assets-jquery2!
rails-erd
Expand Down Expand Up @@ -510,4 +522,4 @@ RUBY VERSION
ruby 2.5.7p206

BUNDLED WITH
1.17.3
2.1.4
4 changes: 2 additions & 2 deletions bin/bundle
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
load Gem.bin_path('bundler', 'bundle')
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
load Gem.bin_path("bundler", "bundle")
Empty file modified bin/guard
100644 → 100755
View file
Empty file.
Loading

0 comments on commit c364f1f

Please sign in to comment.