Skip to content
Permalink
Browse files

Upgrade to Ruby 2.7.0 and Rails 6.0.2.1

  • Loading branch information
harigopal committed Feb 18, 2020
1 parent 537d0be commit 16c3f3651b9c7eb2aef572a7a37ed243c0af43b6
Showing with 69 additions and 81 deletions.
  1. +1 −1 .ruby-version
  2. +2 −2 Gemfile
  3. +62 −62 Gemfile.lock
  4. +4 −0 config/secrets.yml
  5. +0 −16 spec/rails_helper.rb
@@ -1 +1 @@
ruby-2.6.5
ruby-2.7.0
@@ -1,9 +1,9 @@
ruby '2.6.5'
ruby '2.7.0'

source 'https://rubygems.org'

# Ruby on Rails. http://rubyonrails.org
gem 'rails', '~> 6.0.1'
gem 'rails', '~> 6.0.2.1'

gem 'dotenv-rails', '~> 2.2', groups: %i[development test]

@@ -67,38 +67,38 @@ GEM
TimezoneParser (0.4.0)
insensitive_hash
tzinfo
actioncable (6.0.1)
actionpack (= 6.0.1)
actioncable (6.0.2.1)
actionpack (= 6.0.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.1)
actionpack (= 6.0.1)
activejob (= 6.0.1)
activerecord (= 6.0.1)
activestorage (= 6.0.1)
activesupport (= 6.0.1)
actionmailbox (6.0.2.1)
actionpack (= 6.0.2.1)
activejob (= 6.0.2.1)
activerecord (= 6.0.2.1)
activestorage (= 6.0.2.1)
activesupport (= 6.0.2.1)
mail (>= 2.7.1)
actionmailer (6.0.1)
actionpack (= 6.0.1)
actionview (= 6.0.1)
activejob (= 6.0.1)
actionmailer (6.0.2.1)
actionpack (= 6.0.2.1)
actionview (= 6.0.2.1)
activejob (= 6.0.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.1)
actionview (= 6.0.1)
activesupport (= 6.0.1)
rack (~> 2.0)
actionpack (6.0.2.1)
actionview (= 6.0.2.1)
activesupport (= 6.0.2.1)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.1)
actionpack (= 6.0.1)
activerecord (= 6.0.1)
activestorage (= 6.0.1)
activesupport (= 6.0.1)
actiontext (6.0.2.1)
actionpack (= 6.0.2.1)
activerecord (= 6.0.2.1)
activestorage (= 6.0.2.1)
activesupport (= 6.0.2.1)
nokogiri (>= 1.8.5)
actionview (6.0.1)
activesupport (= 6.0.1)
actionview (6.0.2.1)
activesupport (= 6.0.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
@@ -117,20 +117,20 @@ GEM
sassc-rails (~> 2.1)
sprockets (>= 3.0, < 4.1)
sprockets-es6 (~> 0.9, >= 0.9.2)
activejob (6.0.1)
activesupport (= 6.0.1)
activejob (6.0.2.1)
activesupport (= 6.0.2.1)
globalid (>= 0.3.6)
activemodel (6.0.1)
activesupport (= 6.0.1)
activerecord (6.0.1)
activemodel (= 6.0.1)
activesupport (= 6.0.1)
activestorage (6.0.1)
actionpack (= 6.0.1)
activejob (= 6.0.1)
activerecord (= 6.0.1)
activemodel (6.0.2.1)
activesupport (= 6.0.2.1)
activerecord (6.0.2.1)
activemodel (= 6.0.2.1)
activesupport (= 6.0.2.1)
activestorage (6.0.2.1)
actionpack (= 6.0.2.1)
activejob (= 6.0.2.1)
activerecord (= 6.0.2.1)
marcel (~> 0.3.1)
activesupport (6.0.1)
activesupport (6.0.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -224,11 +224,11 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
connection_pool (2.2.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.5)
crass (1.0.6)
css_parser (1.7.0)
addressable
cuprite (0.7.0)
@@ -378,7 +378,7 @@ GEM
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
humanize (2.1.2)
i18n (1.7.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
image_processing (1.9.3)
@@ -449,11 +449,11 @@ GEM
mime-types (3.3)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0904)
mimemagic (0.3.3)
mimemagic (0.3.4)
mini_magick (4.9.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.13.0)
minitest (5.14.0)
motion-markdown-it (8.4.1.2)
linkify-it-rb (~> 2.0)
mdurl-rb (~> 1.0)
@@ -465,7 +465,7 @@ GEM
multipart-post (2.1.1)
netrc (0.11.0)
nio4r (2.5.2)
nokogiri (1.10.7)
nokogiri (1.10.8)
mini_portile2 (~> 2.4.0)
oauth2 (1.4.1)
faraday (>= 0.8, < 0.16.0)
@@ -519,7 +519,7 @@ GEM
nio4r (~> 2.0)
pundit (2.1.0)
activesupport (>= 3.0.0)
rack (2.1.1)
rack (2.2.2)
rack-contrib (2.1.0)
rack (~> 2.0)
rack-cors (1.0.6)
@@ -529,20 +529,20 @@ GEM
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack-timeout (0.5.1)
rails (6.0.1)
actioncable (= 6.0.1)
actionmailbox (= 6.0.1)
actionmailer (= 6.0.1)
actionpack (= 6.0.1)
actiontext (= 6.0.1)
actionview (= 6.0.1)
activejob (= 6.0.1)
activemodel (= 6.0.1)
activerecord (= 6.0.1)
activestorage (= 6.0.1)
activesupport (= 6.0.1)
rails (6.0.2.1)
actioncable (= 6.0.2.1)
actionmailbox (= 6.0.2.1)
actionmailer (= 6.0.2.1)
actionpack (= 6.0.2.1)
actiontext (= 6.0.2.1)
actionview (= 6.0.2.1)
activejob (= 6.0.2.1)
activemodel (= 6.0.2.1)
activerecord (= 6.0.2.1)
activestorage (= 6.0.2.1)
activesupport (= 6.0.2.1)
bundler (>= 1.3.0)
railties (= 6.0.1)
railties (= 6.0.2.1)
sprockets-rails (>= 2.0.0)
rails-assets-bootstrap-tabcollapse (0.2.7)
rails-assets-datetimepicker (2.5.20)
@@ -595,9 +595,9 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (6.0.1)
actionpack (= 6.0.1)
activesupport (= 6.0.1)
railties (6.0.2.1)
actionpack (= 6.0.2.1)
activesupport (= 6.0.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
@@ -749,7 +749,7 @@ GEM
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
tzinfo (1.2.6)
thread_safe (~> 0.1)
uber (0.1.0)
uc.micro-rb (1.0.5)
@@ -872,7 +872,7 @@ DEPENDENCIES
pundit (~> 2.0)
rack-cors (~> 1.0)
rack-timeout (~> 0.4)
rails (~> 6.0.1)
rails (~> 6.0.2.1)
rails-assets-bootstrap-tabcollapse (~> 0.2)!
rails-assets-datetimepicker (~> 2.5)!
rails-assets-gemini-scrollbar (~> 1.5)!
@@ -927,7 +927,7 @@ DEPENDENCIES
webpacker (~> 4.0)

RUBY VERSION
ruby 2.6.5p114
ruby 2.7.0p0

BUNDLED WITH
2.0.2
2.1.2
@@ -58,6 +58,10 @@ development:
<<: *common

test:
aws:
access_key_id: test_access_key
secret_access_key: test_secret_access_key
bucket: test-bucket
sso_domain: sso.test.host
secret_key_base: "fc12d0f63b32c108fad70c1ed5e2502860ea4d59ca8c51f5606c0ff2d8a6eed8ed66bb090e6040b91eccf789d76651b17b5bf522e3611f18967b514560b028de"
slack_token: 'BOT_OAUTH_TOKEN'
@@ -52,22 +52,6 @@
# If you are not using ActiveRecord, you can remove this line.
ActiveRecord::Migration.maintain_test_schema!

service_bug_counter = 0

begin
ActiveStorage::Blob.service = ActiveStorage::Service.configure(:test, test: { service: 'Disk', root: Rails.root.join('tmp/storage') })

if service_bug_counter.zero?
puts "[NOTICE] Workaround for ActiveStorage::Blob.service assignment wasn't triggered. Consider removing it."
end
rescue NoMethodError
raise "Exceeded the number of max retries to set `ActiveStorage::Blob.service`." if service_bug_counter >= 5

service_bug_counter += 1
puts "Encountered ActiveStorage::Blob.service assignment bug. Retrying (Attempt ##{service_bug_counter})..."
retry
end

RSpec.configure do |config|
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
config.fixture_path = ::Rails.root.join('spec/fixtures')

0 comments on commit 16c3f36

Please sign in to comment.
You can’t perform that action at this time.