aboutsummaryrefslogtreecommitdiffstats
path: root/actiontext/test/dummy/config/application.rb
diff options
context:
space:
mode:
authorGeorge Claghorn <george.claghorn@gmail.com>2019-01-05 10:41:41 -0500
committerGitHub <noreply@github.com>2019-01-05 10:41:41 -0500
commit7a88f649da0bd0b8c7534a90b4132cef8d9ec785 (patch)
tree857111ffc3450e52e54aaf2f159e98608aab5f01 /actiontext/test/dummy/config/application.rb
parent35ed21bc1600a3687c63781b70f7543ca162997c (diff)
parent67a9a86b1d69367a3270240dad43bc9825ca80a5 (diff)
downloadrails-7a88f649da0bd0b8c7534a90b4132cef8d9ec785.tar.gz
rails-7a88f649da0bd0b8c7534a90b4132cef8d9ec785.tar.bz2
rails-7a88f649da0bd0b8c7534a90b4132cef8d9ec785.zip
Merge pull request #34875 from bogdanvlviv/test-actiontext-on-rails-6.0
Test actiontext on Rails 6.0
Diffstat (limited to 'actiontext/test/dummy/config/application.rb')
-rw-r--r--actiontext/test/dummy/config/application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actiontext/test/dummy/config/application.rb b/actiontext/test/dummy/config/application.rb
index ddee05a4db..79eeb6ba0e 100644
--- a/actiontext/test/dummy/config/application.rb
+++ b/actiontext/test/dummy/config/application.rb
@@ -8,7 +8,7 @@ require "action_text"
module Dummy
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
- 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