aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* build fix.Yves Senn2015-01-301-4/+4
* scaffold controller_test template should use kwargs. refs #18323.Yves Senn2015-01-301-5/+5
* tests, use `capture` instead of custom `redirect_stderr` helper.Yves Senn2015-01-301-12/+2
* Merge pull request #18736 from nonsensery/autoload-guide-grammar-fixYves Senn2015-01-301-1/+1
|\
| * Fix grammar in Qualified Constants sectionAlex Johnson2015-01-291-1/+1
* | Merge pull request #18734 from andreynering/docs-dumpingRafael Mendonça França2015-01-291-5/+10
|\ \
| * | Improvements about schema dumping [ci skip]Andrey Nering2015-01-291-5/+10
* | | Merge pull request #18477 from Alamoz/scaffold_css_templateRafael Mendonça França2015-01-291-0/+11
|\ \ \
| * | | Add a margin to body and padding to th, td.Adrien Lamothe2015-01-291-0/+11
|/ / /
* | | Merge pull request #18732 from BMorearty/document-bundle-updateRafael Mendonça França2015-01-291-0/+8
|\ \ \
| * | | Doc: run bundle update after cloning Rails.Brian Morearty2015-01-291-0/+8
| |/ /
* | | Remove duplicated testsRafael Mendonça França2015-01-291-30/+0
* | | Merge pull request #18705 from mrgilman/skip-testRafael Mendonça França2015-01-2911-22/+26
|\ \ \ | |_|/ |/| |
| * | Change option description and update test namesMelanie Gilman2015-01-293-3/+3
| * | Update option to skip test in generatorsMelanie Gilman2015-01-2711-20/+24
* | | Post.all.or(anything) == Post.allSean Griffin2015-01-293-7/+7
| |/ |/|
* | Merge pull request #18722 from bogdan/group-by-key-wordRafael Mendonça França2015-01-293-13/+27
|\ \
| * | Fixed AR::Relation#group method when argument is a SQL reserved keywordBogdan Gusiev2015-01-293-13/+27
* | | Consistent usage of spaces in hashes across our codebaseRafael Mendonça França2015-01-2925-113/+117
* | | Use fixed fonts only in the name of the parameterRafael Mendonça França2015-01-293-14/+14
* | | Improve CHANGELOGRafael Mendonça França2015-01-291-6/+5
* | | Merge pull request #18323 from kirs/controller-test-kwargsRafael Mendonça França2015-01-2945-417/+938
|\ \ \ | |/ / |/| |
| * | Switch to kwargs in ActionController::TestCase and ActionDispatch::IntegrationKir Shatrov2015-01-2945-417/+938
|/ /
* | Merge pull request #18627 from tekin/dont-blat-default-formatAndrew White2015-01-293-3/+33
|\ \
| * | Preserve default url options when generating URLsTekin Suleyman2015-01-283-3/+33
* | | Merge pull request #18719 from 5t111111/add-fix-for-loading-fixtures-in-engin...Yves Senn2015-01-291-0/+1
|\ \ \
| * | | Add fix for loading fixtures in engine testsWAKASUGI 5T1111112015-01-291-0/+1
* | | | reassign `file_fixture_path` in plugins `test_helper.rb`. refs #18658.Yves Senn2015-01-291-0/+1
* | | | let dependencies use Module#const_defined?Xavier Noria2015-01-281-2/+2
|/ / /
* | | Don't error when grouped calculations return 0 recordsSean Griffin2015-01-282-1/+6
* | | Merge Pull Request #16052 Added #or to ActiveRecord::RelationSean Griffin2015-01-288-1/+166
|\ \ \
| * | | Bring the implementation of Relation#or up to speedSean Griffin2015-01-285-44/+48
| * | | Added #or to ActiveRecord::RelationMatthew Draper2015-01-286-1/+162
* | | | Always convert strings to UTF-8, regardless of column type in SQLiteSean Griffin2015-01-282-12/+7
| |/ / |/| |
* | | Merge branch 'rm-deprecate_via_redirect'Rafael Mendonça França2015-01-283-5/+31
|\ \ \
| * | | Just assert the deprecation of one methodRafael Mendonça França2015-01-281-10/+15
| * | | Add CHANGELOG entryRafael Mendonça França2015-01-281-0/+6
| * | | Merge pull request #18693 from aditya-kapoor/deprecate_via_redirectRafael Mendonça França2015-01-282-15/+30
|/| | |
| * | | Deprecate *_via_redirect integration test methodsAditya Kapoor2015-01-282-15/+30
* | | | Merge pull request #18716 from tonytonyjan/typoRafael Mendonça França2015-01-281-1/+1
|\ \ \ \
| * | | | table name should be plural [ci skip]Jian Weihang2015-01-291-1/+1
|/ / / /
* | | | Merge pull request #18654 from liseki/fix-aj-test-helperRafael Mendonça França2015-01-282-2/+51
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix ActiveJob assertions with a GlobalID object argumentRichard Manyanza2015-01-232-2/+51
* | | | Don't redefine autosave association callbacks in nested attrsSean Griffin2015-01-286-1/+20
* | | | Merge pull request #18658 from senny/file_fixturesYves Senn2015-01-288-0/+76
|\ \ \ \
| * | | | introduce `ActiveSupport::Testing::FileFixtures`.Yves Senn2015-01-288-0/+76
|/ / / /
* | | | Merge pull request #18709 from ianks/atomic-writeYves Senn2015-01-283-1/+18
|\ \ \ \
| * | | | Return value of yielded block in File.atomic_writeIan Ker-Seymer2015-01-282-1/+14
|/ / / /
* | | | Merge pull request #18666 from cheunghy/auth_check_nilGuillermo Iguaran2015-01-282-2/+9
|\ \ \ \
| * | | | Fixed undefined method error when doing authentication.Zhang Kai Yu2015-01-241-2/+2