Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Fix a state leak in `autosave_association_test` | Sean Griffin | 2015-01-30 | 1 | -0/+5 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test added in 85465ed3e6c582d25f0c8fafe21f7a2c182c2f67 was passing when the file was run on its own, but failing when the entire suite was run since this test modifies the class and doesn't clean up. | |||||
* | | | | | | Always perform validations on nested attribute associations | Sean Griffin | 2015-01-30 | 4 | -5/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collection associations would have already been validated, but singular associations were not. Fixes #18735. | |||||
* | | | | | | fix typo in `_filter` deprecation message. [ci skip] | Yves Senn | 2015-01-30 | 1 | -5/+5 | |
| | | | | | | ||||||
* | | | | | | build fix II, adjust broken tests as a consequence of 670ac73126. | Yves Senn | 2015-01-30 | 1 | -4/+4 | |
| | | | | | | ||||||
* | | | | | | build fix. | Yves Senn | 2015-01-30 | 1 | -4/+4 | |
| | | | | | | ||||||
* | | | | | | scaffold controller_test template should use kwargs. refs #18323. | Yves Senn | 2015-01-30 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This prevents a flood of warnings when generating a new scaffold. | |||||
* | | | | | | tests, use `capture` instead of custom `redirect_stderr` helper. | Yves Senn | 2015-01-30 | 1 | -12/+2 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #18736 from nonsensery/autoload-guide-grammar-fix | Yves Senn | 2015-01-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix grammar in Qualified Constants section [ci skip] | |||||
| * | | | | | | Fix grammar in Qualified Constants section | Alex Johnson | 2015-01-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New wording is based on the "cref" sentence earlier in the section. [ci skip] | |||||
* | | | | | | | Merge pull request #18734 from andreynering/docs-dumping | Rafael Mendonça França | 2015-01-29 | 1 | -5/+10 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Improvements about schema dumping [ci skip] | |||||
| * | | | | | | | Improvements about schema dumping [ci skip] | Andrey Nering | 2015-01-29 | 1 | -5/+10 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #18477 from Alamoz/scaffold_css_template | Rafael Mendonça França | 2015-01-29 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add a margin to body and padding to th, td in scaffold.css. | |||||
| * | | | | | | | | Add a margin to body and padding to th, td. | Adrien Lamothe | 2015-01-29 | 1 | -0/+11 | |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Add space to new css defs. | |||||
* | | | | | | | | Merge pull request #18732 from BMorearty/document-bundle-update | Rafael Mendonça França | 2015-01-29 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Doc: run bundle update after cloning Rails. | |||||
| * | | | | | | | | Doc: run bundle update after cloning Rails. | Brian Morearty | 2015-01-29 | 1 | -0/+8 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Remove duplicated tests | Rafael Mendonça França | 2015-01-29 | 1 | -30/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #18705 from mrgilman/skip-test | Rafael Mendonça França | 2015-01-29 | 11 | -22/+26 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Update option to skip test in generators | |||||
| * | | | | | | | Change option description and update test names | Melanie Gilman | 2015-01-29 | 3 | -3/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Update option to skip test in generators | Melanie Gilman | 2015-01-27 | 11 | -20/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails no longer generates Test::Unit files by default. | |||||
* | | | | | | | | Post.all.or(anything) == Post.all | Sean Griffin | 2015-01-29 | 3 | -7/+7 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #18722 from bogdan/group-by-key-word | Rafael Mendonça França | 2015-01-29 | 3 | -13/+27 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed AR::Relation#group method when argument is a SQL reserved keyword | |||||
| * | | | | | | | Fixed AR::Relation#group method when argument is a SQL reserved keyword | Bogdan Gusiev | 2015-01-29 | 3 | -13/+27 | |
| | | | | | | | | ||||||
* | | | | | | | | Consistent usage of spaces in hashes across our codebase | Rafael Mendonça França | 2015-01-29 | 25 | -113/+117 | |
| | | | | | | | | ||||||
* | | | | | | | | Use fixed fonts only in the name of the parameter | Rafael Mendonça França | 2015-01-29 | 3 | -14/+14 | |
| | | | | | | | | ||||||
* | | | | | | | | Improve CHANGELOG | Rafael Mendonça França | 2015-01-29 | 1 | -6/+5 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #18323 from kirs/controller-test-kwargs | Rafael Mendonça França | 2015-01-29 | 45 | -417/+938 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | Use kwargs in ActionController::TestCase and ActionDispatch::Integration HTTP methods | |||||
| * | | | | | | | Switch to kwargs in ActionController::TestCase and ActionDispatch::Integration | Kir Shatrov | 2015-01-29 | 45 | -417/+938 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-kwargs requests are deprecated now. Guides are updated as well. `post url, nil, nil, { a: 'b' }` doesn't make sense. `post url, params: { y: x }, session: { a: 'b' }` would be an explicit way to do the same | |||||
* | | | | | | | Merge pull request #18627 from tekin/dont-blat-default-format | Andrew White | 2015-01-29 | 3 | -3/+33 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Preserve default format when generating URLs | |||||
| * | | | | | | | Preserve default url options when generating URLs | Tekin Suleyman | 2015-01-28 | 3 | -3/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue that would cause default_url_options to be lost when generating URLs with fewer positional arguments than parameters in the route definition. | |||||
* | | | | | | | | Merge pull request #18719 from ↵ | Yves Senn | 2015-01-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5t111111/add-fix-for-loading-fixtures-in-engine-tests Add fix for loading fixtures in engine tests (additional fix for #4971) Conflicts: railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb | |||||
| * | | | | | | | | Add fix for loading fixtures in engine tests | WAKASUGI 5T111111 | 2015-01-29 | 1 | -0/+1 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | reassign `file_fixture_path` in plugins `test_helper.rb`. refs #18658. | Yves Senn | 2015-01-29 | 1 | -0/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | let dependencies use Module#const_defined? | Xavier Noria | 2015-01-28 | 1 | -2/+2 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Module#const_defined? accepts constant paths in modern Ruby, we no longer need our qualified_* extensions. References #17845. | |||||
* | | | | | | | Don't error when grouped calculations return 0 records | Sean Griffin | 2015-01-28 | 2 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18717 | |||||
* | | | | | | | Merge Pull Request #16052 Added #or to ActiveRecord::Relation | Sean Griffin | 2015-01-28 | 8 | -1/+166 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Bring the implementation of Relation#or up to speed | Sean Griffin | 2015-01-28 | 5 | -44/+48 | |
| | | | | | | | | ||||||
| * | | | | | | | Added #or to ActiveRecord::Relation | Matthew Draper | 2015-01-28 | 6 | -1/+162 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post.where('id = 1').or(Post.where('id = 2')) # => SELECT * FROM posts WHERE (id = 1) OR (id = 2) [Matthew Draper & Gael Muller] | |||||
* | | | | | | | | Always convert strings to UTF-8, regardless of column type in SQLite | Sean Griffin | 2015-01-28 | 2 | -12/+7 | |
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All columns which would map to a string primitive need this behavior. Binary has it's own marker type, so it won't go through this conversion. String and text, which need this, will. Fixes #18585. | |||||
* | | | | | | | Merge branch 'rm-deprecate_via_redirect' | Rafael Mendonça França | 2015-01-28 | 3 | -5/+31 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Just assert the deprecation of one method | Rafael Mendonça França | 2015-01-28 | 1 | -10/+15 | |
| | | | | | | | | ||||||
| * | | | | | | | Add CHANGELOG entry | Rafael Mendonça França | 2015-01-28 | 1 | -0/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #18693 from aditya-kapoor/deprecate_via_redirect | Rafael Mendonça França | 2015-01-28 | 2 | -15/+30 | |
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate *_via_redirect integration test methods | |||||
| * | | | | | | | Deprecate *_via_redirect integration test methods | Aditya Kapoor | 2015-01-28 | 2 | -15/+30 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #18716 from tonytonyjan/typo | Rafael Mendonça França | 2015-01-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | table name should be plural | |||||
| * | | | | | | | | table name should be plural [ci skip] | Jian Weihang | 2015-01-29 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #18654 from liseki/fix-aj-test-helper | Rafael Mendonça França | 2015-01-28 | 2 | -2/+51 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Fix ActiveJob assertions with a GlobalID object argument | |||||
| * | | | | | | | Fix ActiveJob assertions with a GlobalID object argument | Richard Manyanza | 2015-01-23 | 2 | -2/+51 | |
| | | | | | | | | ||||||
* | | | | | | | | Don't redefine autosave association callbacks in nested attrs | Sean Griffin | 2015-01-28 | 6 | -1/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These callbacks will already have been defined when the association was built. The check against `reflection.autosave` happens at call time, not at define time, so simply modifying the reflection is sufficient. Fixes #18704 | |||||
* | | | | | | | | Merge pull request #18658 from senny/file_fixtures | Yves Senn | 2015-01-28 | 8 | -0/+76 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | Add `ActiveSupport::Testing::FileFixtures`. | |||||
| * | | | | | | | introduce `ActiveSupport::Testing::FileFixtures`. | Yves Senn | 2015-01-28 | 8 | -0/+76 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's a thin layer to provide easy access to sample files throughout test-cases. This adds the directory `test/fixtures/files` to newly generated applications. |