diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2009-12-23 19:18:11 -0800 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2009-12-23 19:18:11 -0800 |
| commit | 84f1137ef87ff3c8e7cff5e8363d1f116b23fcae (patch) | |
| tree | d6fe70688d13cbb24302175d348a997ed955ad51 /railties/test/application/configuration_test.rb | |
| parent | c4d6d50a46a0fe53f75aadc306212b5437e22ed8 (diff) | |
| parent | 7a6f73e79b850e05d8d9639310159679ef872fb7 (diff) | |
| download | rails-84f1137ef87ff3c8e7cff5e8363d1f116b23fcae.tar.gz rails-84f1137ef87ff3c8e7cff5e8363d1f116b23fcae.tar.bz2 rails-84f1137ef87ff3c8e7cff5e8363d1f116b23fcae.zip | |
Merge remote branch 'origin/master'
Conflicts:
railties/lib/rails/application.rb
Diffstat (limited to 'railties/test/application/configuration_test.rb')
| -rw-r--r-- | railties/test/application/configuration_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index e71b4c0cdb..4d9da525d7 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -69,7 +69,7 @@ module ApplicationTests RUBY require "#{app_path}/config/application" - assert AppTemplate::Application.configuration.action_controller.allow_concurrency + assert AppTemplate::Application.config.action_controller.allow_concurrency end test "the application can be marked as threadsafe when there are no frameworks" do |