diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2016-06-03 14:00:47 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2016-06-03 14:00:47 +0000 |
| commit | 4e85538dddf47877cacc65cea6c050e349af0405 (patch) | |
| tree | 302517b50aa4eb1fbccf520b752dffda68807c1a /railties/lib | |
| parent | 082a5158251c6578714132e5c4f71bd39f462d71 (diff) | |
| parent | cf2158cbbf12a3a00c780ef5136f11b77c566713 (diff) | |
| download | rails-4e85538dddf47877cacc65cea6c050e349af0405.tar.gz rails-4e85538dddf47877cacc65cea6c050e349af0405.tar.bz2 rails-4e85538dddf47877cacc65cea6c050e349af0405.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/action_cable_overview.md
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/finisher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index 0aed6c1351..4e24640510 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -95,7 +95,7 @@ module Rails elsif config.allow_concurrency == :unsafe # Do nothing, even if we know this is dangerous. This is the - # historical behaviour for true. + # historical behavior for true. else # Default concurrency setting: enabled, but safe |