Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Demodulize ActiveRecord::MigratorTest | Akira Matsuda | 2014-08-29 | 1 | -284/+282 |
| | |||||
* | Merge pull request #16637 from Agis-/redirect-with-constraint-route | Aaron Patterson | 2014-08-28 | 3 | -2/+31 |
|\ | | | | | Fix the router ignoring constraints when used together with a redirect route | ||||
| * | Don't ignore constraints in redirect routes | Agis- | 2014-08-25 | 3 | -2/+31 |
| | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/402c2af55053c2f29319091ad21fd6fa6b90ee89 introduced a regression that caused any constraints added to redirect routes to be ignored. Fixes #16605 | ||||
* | | Avoid using heredoc for user warnings | Godfrey Chan | 2014-08-28 | 10 | -61/+51 |
| | | | | | | | | | | | | | | | | | | | | Using heredoc would enforce line wrapping to whatever column width we decided to use in the code, making it difficult for the users to read on some consoles. This does make the source code read slightly worse and a bit more error-prone, but this seems like a fair price to pay since the primary purpose for these messages are for the users to read and the code will not stick around for too long. | ||||
* | | No transaction for a test that creates fixtures in the test body | Akira Matsuda | 2014-08-29 | 1 | -0/+1 |
| | | |||||
* | | make it easy to copy & paste the config from deprecation warning. | Yves Senn | 2014-08-28 | 1 | -2/+3 |
| | | | | | | | | [ci skip] | ||||
* | | User Model#last to certainly get lastly created data | Akira Matsuda | 2014-08-28 | 1 | -1/+1 |
| | | | | | | | | This test would fail when executed after any test that calls fixtures(:binaries) | ||||
* | | Move model definition to test/models for test order indenendency | Akira Matsuda | 2014-08-28 | 3 | -29/+15 |
| | | |||||
* | | Move association definition to the model file | Akira Matsuda | 2014-08-28 | 2 | -2/+1 |
| | | |||||
* | | Be sure that test fixtures satisfy referential integrity before calculating | Akira Matsuda | 2014-08-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | There exists some other test files that load :minivans fixtures but don't load :speedometers. Loading :speedometers here prevents the following error when this test was run after such test: CalculationsTest#test_should_group_by_association_with_non_numeric_foreign_key: ActiveRecord::RecordNotFound: Couldn't find all Speedometers with 'speedometer_id': (ABC, s1) (found 1 results, but was looking for 2) | ||||
* | | 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 |
| | | |||||
* | | No need to sort tests | Akira Matsuda | 2014-08-28 | 3 | -3/+3 |
| | | | | | | | | Dir.glob result must be already sorted anyway | ||||
* | | Test everything | Akira Matsuda | 2014-08-28 | 1 | -1/+1 |
| | | | | | | | | This actually was testing test everything, so why not do it simpler? | ||||
* | | AP test files does no more need to be alphabetically sorted here | Akira Matsuda | 2014-08-28 | 1 | -4/+1 |
| | | |||||
* | | Ignore SCHEMA queries when asserting no queries | Akira Matsuda | 2014-08-28 | 5 | -22/+22 |
| | | |||||
* | | Reset schema properly after schema changing test | Akira Matsuda | 2014-08-28 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #16727 from BanzaiMan/travis-yml-fix | Rafael Mendonça França | 2014-08-27 | 1 | -0/+1 |
|\ \ | | | | | | | Add language directive to .travis.yml | ||||
| * | | Add language directive to .travis.yml | Hiro Asari | 2014-08-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | Currently, Travis CI assumes that the project is in Ruby in the absence of the `language` key. This behavior may change in the future. (For example, switch to a "blank" image which *may* be created.) | ||||
* | | | remove useless parameter | Aaron Patterson | 2014-08-27 | 1 | -2/+2 |
| | | | |||||
* | | | remove dead code | Aaron Patterson | 2014-08-27 | 1 | -12/+2 |
|/ / | | | | | | | | | | | the ERB has already been compiled to Ruby code by the time we're calling module_eval. Nothing that module eval raises will be caught by a blank `rescue`, so I think we can remove this | ||||
* | | Merge pull request #16544 from schneems/schneems/death-to-dir-glob | Guillermo Iguaran | 2014-08-27 | 6 | -20/+13 |
|\ \ | | | | | | | Refactor out Dir.glob from ActionDispatch::Static | ||||
| * | | Refactor out Dir.glob from ActionDispatch::Static | schneems | 2014-08-27 | 6 | -20/+13 |
|/ / | | | | | | | | | | | | | | | Dir.glob can be a security concern. The original use was to provide logic of fallback files. Example a request to `/` should render the file from `/public/index.html`. We can replace the dir glob with the specific logic it represents. The glob {,index,index.html} will look for the current path, then in the directory of the path with index file and then in the directory of the path with index.html. This PR replaces the glob logic by manually checking each potential match. Best case scenario this results in one less file API request, worst case, this has one more file API request. Related to #16464 Update: added a test for when a file of a given name (`public/bar.html` and a directory `public/bar` both exist in the same root directory. Changed logic to accommodate this scenario. | ||||
* | | Merge pull request #16723 from rubys/mention_assert_select_changes | Zachary Scott | 2014-08-27 | 1 | -0/+13 |
|\ \ | | | | | | | [ci skip] mention assert_select in release notes | ||||
| * | | [ci skip] mention assert_select in release notes | Sam Ruby | 2014-08-27 | 1 | -0/+13 |
|/ / | |||||
* | | Merge pull request #16717 from splattael/keygenerator | Santiago Pastorino | 2014-08-27 | 1 | -1/+1 |
|\ \ | | | | | | | Use less iterations for KeyGenerator in tests | ||||
| * | | Use less iterations for KeyGenerator in tests | Peter Suschlik | 2014-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit improves performance of cookie tests: Ruby | After | Before ----- | --------:| --------: MRI | 5.03s | 9.28s JRuby | 25.45s | 1648.23s Please note the improvement for JRuby. | ||||
* | | | Merge pull request #16707 from katmutua/master | Santiago Pastorino | 2014-08-27 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | update 4_2_release_notes | ||||
| * | | | [ci skip] Update 4_2_release notes | Jackie Mutua | 2014-08-27 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #16702 from sgrif/sg-binary-serialized | Rafael Mendonça França | 2014-08-27 | 3 | -0/+31 |
|\ \ \ \ | | | | | | | | | | | Correctly detect mutation on serialized columns mapping to binary | ||||
| * | | | | Correctly detect mutation on serialized columns mapping to binary | Sean Griffin | 2014-08-27 | 3 | -0/+31 |
| | | | | | | | | | | | | | | | | | | | | Fixes #16701 | ||||
* | | | | | Merge pull request #16722 from yui-knk/fix/guides_association_basics2 | Rafael Mendonça França | 2014-08-27 | 1 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Fix typo of `collection_singular_ids=` method. | ||||
| * | | | | | [ci skip] Fix typo of `collection_singular_ids=` method. | yui-knk | 2014-08-27 | 1 | -4/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #16721 from yui-knk/fix/guides_association_basics | Rafael Mendonça França | 2014-08-27 | 1 | -4/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | [ci skip] Fix typo of `collection=` method. | ||||
| * | | | | | [ci skip] Fix typo of `collection=` method. | yui-knk | 2014-08-27 | 1 | -4/+4 |
|/ / / / / | |||||
* | | | | | Merge pull request #16719 from tgxworld/fix_spelling_in_changelog | Arun Agrawal | 2014-08-27 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix spelling. [CI SKIP] | ||||
| * | | | | | Fix spelling. [CI SKIP] | Guo Xiang Tan | 2014-08-27 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | fix broken `gem` method with non-String arguments. Closes #16709. | Yves Senn | 2014-08-27 | 3 | -4/+23 |
| | | | | | | | | | | | | | | | | | | | | This was caused by #15327. | ||||
* | | | | | minor changelog formatting changes. | Yves Senn | 2014-08-27 | 3 | -9/+11 |
| | | | | | |||||
* | | | | | Merge pull request #16661 from edogawaconan/doc-fix | Yves Senn | 2014-08-27 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Update documentation to match change in #5942 [ci skip] | ||||
| * | | | | | Update documentation to match change in #5942 [ci skip] | edogawaconan | 2014-08-24 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #16715 from y-yagi/update_4_2_release_notes | Zachary Scott | 2014-08-27 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | [ci skip] Modify a web-console PR link for release noted | ||||
| * | | | | | [ci skip] Modify a web-console PR link | yuuji.yaginuma | 2014-08-27 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #16713 from tomkadwill/documented_eqls_other_param | Zachary Scott | 2014-08-27 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Updated documentation syntax of other parameter for rdoc | ||||
| * | | | | | [ci skip] Updated documentation syntax of other parameter for rdoc | Tom Kadwill | 2014-08-27 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #16708 from zzak/bcjordan-patch-1 | Zachary Scott | 2014-08-26 | 1 | -16/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | Adjusted punctuation and grammar for Form Helpers guide [ci skip] | ||||
| * | | | | | Adjusted punctuation and grammar for Form Helpers guide [ci skip] | Brian Jordan | 2014-08-26 | 1 | -16/+16 |
|/ / / / / | |||||
* | | | | | Merge pull request #16705 from tomkadwill/documented_many_block_param | Zachary Scott | 2014-08-26 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Updated documentation syntax of block parameter for rdoc | ||||
| * | | | | | [ci skip] Updated documentation syntax of block parameter for rdoc | Tom Kadwill | 2014-08-26 | 1 | -1/+1 |
| | | | | | |