aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16984 from chancancode/fix_16578Godfrey Chan2014-09-221-5/+1
|\ | | | | Document that the default for `rails server -b` has changed
| * Document that the default for `rails server -b` has changedGodfrey Chan2014-09-221-5/+1
| | | | | | | | Fixes #16578
* | Standardize on `Rails.application` [ci skip]Tamir Duberstein2014-09-192-2/+2
|/ | | | This seems to be the style settled on in most of the templates.
* Merge pull request #16936 from untidy-hair/plugin_test_db_migrate_pathRafael Mendonça França2014-09-183-3/+21
|\ | | | | | | | | | | | | Specify dummy app's db migrate path in plugin's test_helper.rb Conflicts: railties/CHANGELOG.md
| * Specify dummy app's db migrate path in plugin's test_helper.rbYukio Mizuta2014-09-163-3/+21
| |
* | inject Rack::Lock if config.eager_load is falseXavier Noria2014-09-183-3/+20
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | If code is not eager loaded constants are loaded on demand. Constant autoloading is not thread-safe, so if eager loading is not enabled multi-threading should not be allowed. This showed up in certain Capybara scenarios: Most Capybara drivers other than Rack::Test need a web server. In particular, drivers for JavaScript support. Capybara launches WEBrick in its own thread for those but that per se is fine, because the spec thread and the server thread are coordinated. Problem comes if the page being served in the spec makes Ajax calls. Those may hit WEBrick in parallel, and since WEBrick is multi-threaded and allow_concurrency? returns true in the test environment before this patch, threads are spawned to serve those parallel requests. On the other hand, since eager_load is false by default in the test environment, constants are not preloaded. So the suite is autoloading constants in a multi-threaded set. That's a receipt for paracetamol. The symptom is random obscure errors whose messages point somehow to constant autoloading. As a consequence of this fix for allow_concurrency? WEBrick in Capybara scenarios no longer runs in multi-threaded mode. Fixes #15089.
* Improve environment config templates consistency:Thibault Jouan2014-09-161-3/+4
| | | | | * Fix long lines; * Use simple quotes for string literals when interpolation is not used.
* Merge pull request #16914 from untidy-hair/fix_plugin_dummy_path_errorRafael Mendonça França2014-09-163-2/+10
|\ | | | | Use dynamic path for dummy app location in plugin's test_helper.rb
| * Use dynamic path for dummy app location in plugin's test_helper.rbYukio Mizuta2014-09-143-2/+10
| |
* | Add `test:jobs` taskyuuji.yaginuma2014-09-152-6/+17
|/
* Change ActiveJob test directory to "test/jobs"yuuji.yaginuma2014-09-131-1/+1
|
* Always define capture to remove the deprecation messageRafael Mendonça França2014-09-111-17/+15
|
* Define the configuration at Active SupportRafael Mendonça França2014-09-112-0/+2
|
* Set test order in ActiveSupport::TestCase of isolation/abstract_unitRafael Mendonça França2014-09-101-0/+2
|
* Set the test order to be random in the generated appRafael Mendonça França2014-09-101-0/+1
| | | | | | This will avoid the warning in our tests. We delete all the config/environments/ files in the test app so our default code will not work.
* Merge pull request #16839 from chancancode/default_test_orderRafael Mendonça França2014-09-102-1/+4
|\ | | | | | | Default to sorting user's test cases for now
| * Default to sorting user's test cases for nowGodfrey Chan2014-09-082-1/+4
| | | | | | | | | | | | | | | | | | | | | | Goals: 1. Default to :random for newly generated applications 2. Default to :sorted for existing applications with a warning 3. Only show the warning once 4. Only show the warning if the app actually uses AS::TestCase Fixes #16769
* | Tell the user which file is missing when config/database.yml was not foundAkira Matsuda2014-09-102-3/+13
| | | | | | | | | | | | Since cc03675d30b58e28f585720dad14e947a57ff5b the error message became like "Could not load database configuration. No such file -" which doesn't really tell what's actually missing.
* | Removed any default margin from body.Sahil Lavingia2014-09-091-1/+5
| |
* | Remove extra newline from ActiveJob test templateyuuji.yaginuma2014-09-091-1/+0
|/
* Dependencies: bump to jquery-rails 4.0.0.beta2Godfrey Chan2014-09-051-1/+1
|
* Use the released jquery-rails gemGodfrey Chan2014-09-051-2/+8
|
* world writable might be a bit too open...Peter Schröder2014-09-051-1/+2
|
* Change "For not..." to "Do not...".Kale Worsley2014-09-041-1/+1
|
* build fix, we have to reset the RACK_ENV as well.Yves Senn2014-09-041-2/+5
| | | | | This is a follow-up to ded17a4 to get the build passing on Travis. As Travis has `ENV["RACK_ENV"]` set to `test` we need to reset that as well.
* Merge pull request #16775 from kaspth/ship-secure-sanitizerRafael Mendonça França2014-09-031-41/+0
|\ | | | | Ship with rails-html-sanitizer instead.
| * Ship with rails-html-sanitizer instead.Kasper Timm Hansen2014-09-031-41/+0
| |
* | Merge pull request #16756 from huoxito/dont-mess-railties-default-orderRafael Mendonça França2014-09-032-8/+45
|\ \ | | | | | | Dont mess with default order engines load (4.1.6.rc1 regression)
| * | Dont mess with default order engines loadWashington Luiz2014-09-022-8/+45
| | | | | | | | | | | | | | | | | | | | | When copying migrations some engines might depend on schema from other engine so we can't blindly reverse all railties collection as that would affect the order they were originally loaded. This patch helps to only apply the order from engines specified in `railties_order`
* | | schema loading rake tasks maintain database connection for current env.Yves Senn2014-09-031-0/+26
| |/ |/| | | | | | | | | | | | | | | | | [Joshua Cody & Yves Senn] Closes #16757. Prior to this patch schema loading rake tasks had the potential to leak a connection to a different database. This had side-effects when rake tasks operating on the current connection (like `db:seed`) were chained.
* | Merge pull request #16724 from seuros/testcaseRafael Mendonça França2014-09-021-1/+2
|\ \ | | | | | | [ActiveJob] TestCase
| * | [ActiveJob] TestCaseAbdelkader Boudih2014-09-021-1/+0
| | |
| * | [ActiveJob] TestCaseAbdelkader Boudih2014-09-021-1/+3
| | |
* | | Leave all our tests as order_dependent! for nowMatthew Draper2014-09-021-0/+4
|/ / | | | | | | | | | | | | | | | | We're seeing too many failures to believe otherwise. This reverts commits bc116a55ca3dd9f63a1f1ca7ade3623885adcc57, cbde413df3839e06dd14e3c220e9800af91e83ab, bf0a67931dd8e58f6f878b9510ae818ae1f29a3a, and 2440933fe2c27b27bcafcd9019717800db2641aa.
* | Add test to assert the right sanitizer vendor is being usedRafael Mendonça França2014-09-011-0/+41
| |
* | Try with web-console masterRafael Mendonça França2014-09-011-1/+1
| |
* | Use jquery-rails masterRafael Mendonça França2014-09-011-1/+1
| |
* | Keep it closer to the original wording [ci skip]Godfrey Chan2014-08-311-1/+1
| |
* | Since /console is an optional feature, mention <%= console %> instead.Rhett Sutphin2014-08-311-1/+1
|/ | | | (/console is not mounted by default with web-console 2.0.)
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-2920-35/+93
|\
| * Expectations firstAkira Matsuda2014-08-284-9/+9
| |
| * Reset RACK_ENV after modified in a test caseAkira Matsuda2014-08-281-0/+1
| |
| * Rails.root should be a PathnameAkira Matsuda2014-08-281-1/+1
| |
| * Fix spelling. [CI SKIP]Guo Xiang Tan2014-08-271-1/+1
| |
| * fix broken `gem` method with non-String arguments. Closes #16709.Yves Senn2014-08-273-4/+23
| | | | | | | | This was caused by #15327.
| * show stats for app/jobsyuuji.yaginuma2014-08-241-1/+2
| |
| * [ActiveJob] Add hook for test_framework and test templatesAbdelkader Boudih2014-08-222-0/+22
| |
| * Merge pull request #16622 from matthewd/default-debugMatthew Draper2014-08-232-3/+3
| |\ | | | | | | Don't fight against ourselves for the default log level
| | * Don't fight against ourselves for the default log levelMatthew Draper2014-08-222-3/+3
| | | | | | | | | | | | | | | | | | | | | If we want to always default to :debug, let's just do that. At which point the production.rb entry can become an "uncomment to change" instead.
| * | Merge pull request #16604 from saarons/clean-remote-ip-middlewareJeremy Kemper2014-08-211-1/+15
| |\ \ | | | | | | | | ActionDispatch::RemoteIp accept IPAddr matches for trusted proxies
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 07:15:58 +0000