Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Improve welcome page css and table cell aignments. | buddhamagnet | 2014-09-25 | 2 | -14/+11 | |
| | | | ||||||
* | | | Use released rails-html-sanitizer and rails-deprecated_sanitizer | Godfrey Chan | 2014-09-26 | 1 | -1/+1 | |
| | | | ||||||
* | | | Use release web-console | Rafael Mendonça França | 2014-09-25 | 1 | -1/+1 | |
| | | | ||||||
* | | | Remove --skip-action-view option from application generator | Dan Olson | 2014-09-24 | 5 | -11/+9 | |
| | | | ||||||
* | | | Fix loading fixtures in engine tests | Grzesiek Kolodziejczyk | 2014-09-23 | 1 | -1/+1 | |
|/ / | | | | | | | | | | | | | fixture_path is a class attribute of ActiveSupport::TestCase, so ActiveSupport::TestCase.method_defined?(:fixture_path=) would always return false. This should fix #4971 | |||||
* / | Fix another false assertions | Yuki Nishijima | 2014-09-21 | 1 | -1/+1 | |
|/ | | | | | | | | | | | | * The assertions in AS::Duration don't actually assert. * The assertion in Railtie will pass even when `eager_load_namespaces` doesn't include `AppTemplate::Application` if `Rails.application` is truthy. For more details, see here: * https://github.com/rails/rails/pull/16998 * https://github.com/rails/rails/pull/17000 | |||||
* | Merge pull request #16984 from chancancode/fix_16578 | Godfrey Chan | 2014-09-22 | 1 | -5/+1 | |
|\ | | | | | Document that the default for `rails server -b` has changed | |||||
| * | Document that the default for `rails server -b` has changed | Godfrey Chan | 2014-09-22 | 1 | -5/+1 | |
| | | | | | | | | Fixes #16578 | |||||
* | | Standardize on `Rails.application` [ci skip] | Tamir Duberstein | 2014-09-19 | 2 | -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_path | Rafael Mendonça França | 2014-09-18 | 3 | -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.rb | Yukio Mizuta | 2014-09-16 | 3 | -3/+21 | |
| | | ||||||
* | | inject Rack::Lock if config.eager_load is false | Xavier Noria | 2014-09-18 | 3 | -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 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 | 3 | -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.rb | Yukio Mizuta | 2014-09-14 | 3 | -2/+10 | |
| | | ||||||
* | | Add `test:jobs` task | yuuji.yaginuma | 2014-09-15 | 2 | -6/+17 | |
|/ | ||||||
* | Change ActiveJob test directory to "test/jobs" | yuuji.yaginuma | 2014-09-13 | 1 | -1/+1 | |
| | ||||||
* | Always define capture to remove the deprecation message | Rafael Mendonça França | 2014-09-11 | 1 | -17/+15 | |
| | ||||||
* | Define the configuration at Active Support | Rafael Mendonça França | 2014-09-11 | 2 | -0/+2 | |
| | ||||||
* | Set test order in ActiveSupport::TestCase of isolation/abstract_unit | Rafael Mendonça França | 2014-09-10 | 1 | -0/+2 | |
| | ||||||
* | Set the test order to be random in the generated app | Rafael Mendonça França | 2014-09-10 | 1 | -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_order | Rafael Mendonça França | 2014-09-10 | 2 | -1/+4 | |
|\ | | | | | | | Default to sorting user's test cases for now | |||||
| * | Default to sorting user's test cases for now | Godfrey Chan | 2014-09-08 | 2 | -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 found | Akira Matsuda | 2014-09-10 | 2 | -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 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 | |
| | ||||||
* | build fix, we have to reset the RACK_ENV as well. | Yves Senn | 2014-09-04 | 1 | -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-sanitizer | Rafael Mendonça França | 2014-09-03 | 1 | -41/+0 | |
|\ | | | | | Ship with rails-html-sanitizer instead. | |||||
| * | Ship with rails-html-sanitizer instead. | Kasper Timm Hansen | 2014-09-03 | 1 | -41/+0 | |
| | | ||||||
* | | Merge pull request #16756 from huoxito/dont-mess-railties-default-order | Rafael Mendonça França | 2014-09-03 | 2 | -8/+45 | |
|\ \ | | | | | | | Dont mess with default order engines load (4.1.6.rc1 regression) | |||||
| * | | Dont mess with default order engines load | Washington Luiz | 2014-09-02 | 2 | -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 Senn | 2014-09-03 | 1 | -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/testcase | Rafael Mendonça França | 2014-09-02 | 1 | -1/+2 | |
|\ \ | | | | | | | [ActiveJob] TestCase | |||||
| * | | [ActiveJob] TestCase | Abdelkader Boudih | 2014-09-02 | 1 | -1/+0 | |
| | | | ||||||
| * | | [ActiveJob] TestCase | Abdelkader Boudih | 2014-09-02 | 1 | -1/+3 | |
| | | | ||||||
* | | | Leave all our tests as order_dependent! for now | Matthew Draper | 2014-09-02 | 1 | -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 used | Rafael Mendonça França | 2014-09-01 | 1 | -0/+41 | |
| | | ||||||
* | | 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 | 20 | -35/+93 | |
|\ | ||||||
| * | Expectations first | Akira Matsuda | 2014-08-28 | 4 | -9/+9 | |
| | | ||||||
| * | Reset RACK_ENV after modified in a test case | Akira Matsuda | 2014-08-28 | 1 | -0/+1 | |
| | | ||||||
| * | Rails.root should be a Pathname | Akira Matsuda | 2014-08-28 | 1 | -1/+1 | |
| | | ||||||
| * | Fix spelling. [CI SKIP] | Guo Xiang Tan | 2014-08-27 | 1 | -1/+1 | |
| | |