Merge branch 'master' into 4-0-dev

Author: JonRowe

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2019-04-01T20:23:57+02:00 from the rspec-dev repo.
+# This file was generated on 2019-07-24T15:33:53+02:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # This file contains defaults for RSpec projects. Individual projects

script/downgrade_bundler_on_old_rails

@@ -9,10 +9,8 @@ if ruby -e "exit(ENV['RAILS_VERSION'].scan(/\d+\.\d+.\d+/)[0].to_f < 5)"; then
   # On Rails versions less than 5, Bundler 2.0 is not supported
   echo "Warning dowgrading to older version of Bundler"
 
-  gem uninstall -aIx bundler || echo "Warning error occured removing bundler via gem"
-
   # Delete all bundler version because we do not support Bundler 2+ below Rails 4
-  rvm @global do gem uninstall -aIx bundler || true
+  rvm @global do gem uninstall -aIx bundler || echo "Warning error occured removing bundler via rvm"
 
   gem install bundler -v '1.17.3'
 fi