aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16936 from untidy-hair/plugin_test_db_migrate_pathRafael Mendonça França2014-09-181-0/+3
|\ | | | | | | | | | | | | 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-161-0/+3
| |
* | inject Rack::Lock if config.eager_load is falseXavier Noria2014-09-181-1/+5
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-161-1/+1
|\ | | | | 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-141-1/+1
| |
* | Add `test:jobs` taskyuuji.yaginuma2014-09-151-3/+3
|/
* Change ActiveJob test directory to "test/jobs"yuuji.yaginuma2014-09-131-1/+1
|
* Merge pull request #16839 from chancancode/default_test_orderRafael Mendonça França2014-09-101-0/+3
|\ | | | | | | Default to sorting user's test cases for now
| * Default to sorting user's test cases for nowGodfrey Chan2014-09-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | 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-101-3/+4
| | | | | | | | | | | | 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
|
* Merge pull request #16756 from huoxito/dont-mess-railties-default-orderRafael Mendonça França2014-09-031-8/+9
|\ | | | | Dont mess with default order engines load (4.1.6.rc1 regression)
| * Dont mess with default order engines loadWashington Luiz2014-09-021-8/+9
| | | | | | | | | | | | | | 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`
* | [ActiveJob] TestCaseAbdelkader Boudih2014-09-021-1/+0
| |
* | [ActiveJob] TestCaseAbdelkader Boudih2014-09-021-1/+3
| |
* | 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-2911-23/+48
|\
| * fix broken `gem` method with non-String arguments. Closes #16709.Yves Senn2014-08-271-4/+6
| | | | | | | | 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.
| * | fix grammar [ci skip]Vijay Dev2014-08-221-1/+1
| | |
| * | fix server names [ci skip]Vijay Dev2014-08-221-1/+1
| |/ | | | | Per feedback in https://github.com/rails/rails/commit/af63e4a2546629c3fb2d53cffb7d4ea0e8663f68#commitcomment-7477636
| * Make text consistent in help text of rails server and console commands.Vijay Dev2014-08-212-13/+13
| |
| * Remove timestamp type from generator usageRafael Mendonça França2014-08-201-1/+0
| | | | | | | | It was soft removed at 03035d69e14032a589e9653e3145237b8a9a09be
| * Require ActiveJob in case a skip_xxx option is givenslainer682014-08-201-0/+1
| | | | | | | | Change position of require active_job
| * remove end-of-line spacing in development.rb, production.rbNick Sinenko2014-08-202-2/+2
| |
* | Preparing for 4.2.0.beta1 releaseDavid Heinemeier Hansson2014-08-191-1/+1
|/
* Fix blank link on config/application.rb app template [ci skip]Carlos Antonio da Silva2014-08-191-1/+1
|
* Fix setting simple values to the new config.xCarlos Antonio da Silva2014-08-191-4/+10
| | | | | | | | | | Previously setting simple values to the config.x object resulted in the following: config.x.super_debugger = true config.x.super_debugger #=> {} Which was against the examples showed in the changelog/release notes.
* Point to right sass-rails versionRafael Mendonça França2014-08-191-1/+1
|
* Use web-console 2.0.0.beta2 on new appsGuillermo Iguaran2014-08-191-1/+1
|
* Revert "Improve custom configuration"Rafael Mendonça França2014-08-192-37/+15
| | | | | | | | | This reverts commit de4891344ccc074f6d5693f4fac6ad610584e336. Conflicts: railties/lib/rails/railtie/configuration.rb It added regression. Will be back after the beta
* We always get the value so no need to check nil or HashRafael Mendonça França2014-08-191-6/+2
|
* Use released rails-html-sanitizerRafael Mendonça França2014-08-191-1/+1
|
* Merge pull request #16563 from arthurnn/add_ar_raise_trans_optionRafael Mendonça França2014-08-191-0/+5
|\ | | | | Add default .raise_in_transactional_callbacks option to template
| * Add default .raise_in_transactional_callbacks option to templateArthur Neves2014-08-191-0/+5
| |
* | loofah require dependecy is not needed anymoreRafael Mendonça França2014-08-191-2/+0
| |
* | Improve custom configurationRafael Mendonça França2014-08-192-15/+41
|/ | | | | | | | | | | | | | | | 1. Hashes can be assigned 2. We don't need a special level anymore The method chain only works in the top level. If users need a second level they need to assign a OrderedOptions to the key: config.resque.server = ActiveSupport::OrderedOptions.new config.resque.server.url = "http://localhost" config.resque.server.port = 3000 [Rafael Mendonça França + Carlos Antonio da Silva]
* Rack is released tooRafael Mendonça França2014-08-181-4/+2
|