| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | inject Rack::Lock if config.eager_load is false | Xavier Noria | 2014-09-18 | 1 | -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 Jouan | 2014-09-16 | 1 | -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_error | Rafael Mendonça França | 2014-09-16 | 1 | -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.rb | Yukio Mizuta | 2014-09-14 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add `test:jobs` task | yuuji.yaginuma | 2014-09-15 | 1 | -3/+3 | |
| |/ | ||||||
| * | Change ActiveJob test directory to "test/jobs" | yuuji.yaginuma | 2014-09-13 | 1 | -1/+1 | |
| | | ||||||
| * | Merge pull request #16839 from chancancode/default_test_order | Rafael Mendonça França | 2014-09-10 | 1 | -0/+3 | |
| |\ | | | | | | | Default to sorting user's test cases for now | |||||
| | * | Default to sorting user's test cases for now | Godfrey Chan | 2014-09-08 | 1 | -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 found | Akira Matsuda | 2014-09-10 | 1 | -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 Lavingia | 2014-09-09 | 1 | -1/+5 | |
| | | | ||||||
| * | | Remove extra newline from ActiveJob test template | yuuji.yaginuma | 2014-09-09 | 1 | -1/+0 | |
| |/ | ||||||
| * | Dependencies: bump to jquery-rails 4.0.0.beta2 | Godfrey Chan | 2014-09-05 | 1 | -1/+1 | |
| | | ||||||
| * | Use the released jquery-rails gem | Godfrey Chan | 2014-09-05 | 1 | -2/+8 | |
| | | ||||||
| * | world writable might be a bit too open... | Peter Schröder | 2014-09-05 | 1 | -1/+2 | |
| | | ||||||
| * | Change "For not..." to "Do not...". | Kale Worsley | 2014-09-04 | 1 | -1/+1 | |
| | | ||||||
| * | Merge pull request #16756 from huoxito/dont-mess-railties-default-order | Rafael Mendonça França | 2014-09-03 | 1 | -8/+9 | |
| |\ | | | | | Dont mess with default order engines load (4.1.6.rc1 regression) | |||||
| | * | Dont mess with default order engines load | Washington Luiz | 2014-09-02 | 1 | -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] TestCase | Abdelkader Boudih | 2014-09-02 | 1 | -1/+0 | |
| | | | ||||||
| * | | [ActiveJob] TestCase | Abdelkader Boudih | 2014-09-02 | 1 | -1/+3 | |
| | | | ||||||
| * | | Try with web-console master | Rafael Mendonça França | 2014-09-01 | 1 | -1/+1 | |
| | | | ||||||
| * | | Use jquery-rails master | Rafael Mendonça França | 2014-09-01 | 1 | -1/+1 | |
| | | | ||||||
| * | | Keep it closer to the original wording [ci skip] | Godfrey Chan | 2014-08-31 | 1 | -1/+1 | |
| | | | ||||||
| * | | Since /console is an optional feature, mention <%= console %> instead. | Rhett Sutphin | 2014-08-31 | 1 | -1/+1 | |
| |/ | | | | (/console is not mounted by default with web-console 2.0.) | |||||
| * | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2014-08-29 | 11 | -23/+48 | |
| |\ | ||||||
| | * | fix broken `gem` method with non-String arguments. Closes #16709. | Yves Senn | 2014-08-27 | 1 | -4/+6 | |
| | | | | | | | | | This was caused by #15327. | |||||
| | * | show stats for app/jobs | yuuji.yaginuma | 2014-08-24 | 1 | -1/+2 | |
| | | | ||||||
| | * | [ActiveJob] Add hook for test_framework and test templates | Abdelkader Boudih | 2014-08-22 | 2 | -0/+22 | |
| | | | ||||||
| | * | Merge pull request #16622 from matthewd/default-debug | Matthew Draper | 2014-08-23 | 2 | -3/+3 | |
| | |\ | | | | | | | Don't fight against ourselves for the default log level | |||||
| | | * | Don't fight against ourselves for the default log level | Matthew Draper | 2014-08-22 | 2 | -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 Dev | 2014-08-22 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | fix server names [ci skip] | Vijay Dev | 2014-08-22 | 1 | -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 Dev | 2014-08-21 | 2 | -13/+13 | |
| | | | ||||||
| | * | Remove timestamp type from generator usage | Rafael Mendonça França | 2014-08-20 | 1 | -1/+0 | |
| | | | | | | | | | It was soft removed at 03035d69e14032a589e9653e3145237b8a9a09be | |||||
| | * | Require ActiveJob in case a skip_xxx option is given | slainer68 | 2014-08-20 | 1 | -0/+1 | |
| | | | | | | | | | Change position of require active_job | |||||
| | * | remove end-of-line spacing in development.rb, production.rb | Nick Sinenko | 2014-08-20 | 2 | -2/+2 | |
| | | | ||||||
| * | | Preparing for 4.2.0.beta1 release | David Heinemeier Hansson | 2014-08-19 | 1 | -1/+1 | |
| |/ | ||||||
| * | Fix blank link on config/application.rb app template [ci skip] | Carlos Antonio da Silva | 2014-08-19 | 1 | -1/+1 | |
| | | ||||||
| * | Fix setting simple values to the new config.x | Carlos Antonio da Silva | 2014-08-19 | 1 | -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 version | Rafael Mendonça França | 2014-08-19 | 1 | -1/+1 | |
| | | ||||||
| * | Use web-console 2.0.0.beta2 on new apps | Guillermo Iguaran | 2014-08-19 | 1 | -1/+1 | |
| | | ||||||
| * | Revert "Improve custom configuration" | Rafael Mendonça França | 2014-08-19 | 2 | -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 Hash | Rafael Mendonça França | 2014-08-19 | 1 | -6/+2 | |
| | | ||||||
| * | Use released rails-html-sanitizer | Rafael Mendonça França | 2014-08-19 | 1 | -1/+1 | |
| | | ||||||
| * | Merge pull request #16563 from arthurnn/add_ar_raise_trans_option | Rafael Mendonça França | 2014-08-19 | 1 | -0/+5 | |
| |\ | | | | | Add default .raise_in_transactional_callbacks option to template | |||||
| | * | Add default .raise_in_transactional_callbacks option to template | Arthur Neves | 2014-08-19 | 1 | -0/+5 | |
| | | | ||||||
| * | | loofah require dependecy is not needed anymore | Rafael Mendonça França | 2014-08-19 | 1 | -2/+0 | |
| | | | ||||||
| * | | Improve custom configuration | Rafael Mendonça França | 2014-08-19 | 2 | -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 too | Rafael Mendonça França | 2014-08-18 | 1 | -4/+2 | |
| | | ||||||
| * | No need to point to arel and i18n master anymore | Rafael Mendonça França | 2014-08-18 | 1 | -6/+2 | |
| | | ||||||
| * | Fix rails-html_sanitizer in Gemfile template | Jon Atack | 2014-08-18 | 1 | -1/+1 | |
| | | | | [skip ci] | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |