aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #21754 from lucasmazza/lm-assert-differenceRafael Mendonça França2015-09-243-2/+23
|\ \ \ \ \
| * | | | | Make `assert_difference` return the result of the yielded block.Lucas Mazza2015-09-243-2/+23
* | | | | | Merge pull request #21753 from jonatack/fix-typo-in-ignored_columns_testRafael Mendonça França2015-09-241-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo in ignored_columns test [skip ci]Jon Atack2015-09-241-1/+1
|/ / / / / /
* | | | | | Merge pull request #21720 from byroot/ignore-columnsSean Griffin2015-09-245-1/+37
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Implement ActiveRecord::Base.ignored_columnsJean Boussier2015-09-245-1/+37
|/ / / / /
* | | | | Merge pull request #21550 from didacte/unscope-associationsSean Griffin2015-09-243-1/+26
|\ \ \ \ \
| * | | | | Include association's `unscope` when preloadingJimmy Bourassa2015-09-092-1/+22
* | | | | | Merge pull request #21697 from gdeglin/fix_returning_disabled_default_values_bugSean Griffin2015-09-242-1/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix a bug with returning_disabled when using the postgresql adapterGeorge Deglin2015-09-202-1/+16
* | | | | | Merge pull request #21746 from amitsuroliya/doc_fixesKasper Timm Hansen2015-09-242-3/+3
|\ \ \ \ \ \
| * | | | | | Improve readability of docs by using code tag [ci skip]amitkumarsuroliya2015-09-242-3/+3
|/ / / / / /
* | | | | | Merge pull request #21740 from cllns/add-jbuilder-notesYves Senn2015-09-241-0/+33
|\ \ \ \ \ \
| * | | | | | Add note about JbuilderSean Collins2015-09-231-0/+33
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #21744 from amitsuroliya/doc_changesYves Senn2015-09-241-1/+1
|\ \ \ \ \ \
| * | | | | | Fix ActiveRecord `instance_method_already_implemented` docs [ci skip]amitkumarsuroliya2015-09-241-1/+1
* | | | | | | Merge pull request #21745 from brandoncc/patch-1Yves Senn2015-09-241-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix out of sync commentBrandon Conway2015-09-231-1/+1
|/ / / / / /
* | | | | | call `get` instead of controller.processAaron Patterson2015-09-231-12/+10
* | | | | | remove controller constructionAaron Patterson2015-09-231-8/+4
* | | | | | stop directly referencing the request and response objectsAaron Patterson2015-09-231-23/+21
* | | | | | test framework allocates the controller for usAaron Patterson2015-09-231-1/+0
* | | | | | type of response should not matterAaron Patterson2015-09-231-6/+0
* | | | | | don't touch the response object until after we call `get`Aaron Patterson2015-09-231-5/+2
* | | | | | stop directly setting headers on the controllerAaron Patterson2015-09-232-14/+1
* | | | | | stop constructing a request object in this setterAaron Patterson2015-09-231-1/+0
* | | | | | test against controller responsesAaron Patterson2015-09-231-52/+65
* | | | | | stop applying default headers in ActionDispatch::ResponseAaron Patterson2015-09-237-16/+25
* | | | | | Merge pull request #21737 from cllns/make-engine-paths-consistentEileen M. Uchitelle2015-09-231-2/+2
|\ \ \ \ \ \
| * | | | | | Change the paths for both Gemfile lines to be 'engines/blorgh'Sean Collins2015-09-231-2/+2
| |/ / / / /
* | | | | | Merge pull request #21742 from vngrs/fix_ar_locking_docSean Griffin2015-09-231-2/+2
|\ \ \ \ \ \
| * | | | | | Fix ActiveRecord::Locking doc [ci skip]Mehmet Emin İNAÇ2015-09-241-2/+2
|/ / / / / /
* | | | | | Merge pull request #21218 from repinel/fix-as-callback-terminatorKasper Timm Hansen2015-09-237-36/+45
|\ \ \ \ \ \
| * | | | | | Fix the AS::Callbacks terminator regression from 4.2.3Roque Pinel2015-09-227-36/+45
* | | | | | | Merge pull request #21736 from eliotsykes/document-bearer-prefixKasper Timm Hansen2015-09-231-5/+7
|\ \ \ \ \ \ \
| * | | | | | | Document Bearer prefix for Authorization header [ci skip]Eliot Sykes2015-09-231-5/+7
* | | | | | | | Merge pull request #21721 from ronakjangir47/remove_mocha_railties_app_generatorKasper Timm Hansen2015-09-231-87/+106
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed Mocha from app generators testsRonak Jangir2015-09-231-87/+106
| |/ / / / / / /
* | | | | | | | Merge pull request #21739 from ronakjangir47/subsecond_precision_supportedSean Griffin2015-09-231-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | skipped assertion on datetime seconds precision as it is only valid for newer...Ronak Jangir2015-09-241-0/+1
| |/ / / / / / /
* | | | | | | | don't access the response object before a request was madeAaron Patterson2015-09-231-1/+10
* | | | | | | | split cookie testsAaron Patterson2015-09-231-1/+6
| |_|/ / / / / |/| | | | | |
* | | | | | | don't mutate a response object after to_aAaron Patterson2015-09-231-0/+2
|/ / / / / /
* | | | | | Further remove reliance on subsecond precision in testsSean Griffin2015-09-231-6/+14
* | | | | | Don't rely on subsecond precision being applied in testsSean Griffin2015-09-235-5/+24
* | | | | | 0 precision is not the same as no precisionSean Griffin2015-09-231-8/+28
* | | | | | Don't attempt to specify datetime precision unless supportedSean Griffin2015-09-233-13/+32
* | | | | | Merge pull request #20317Sean Griffin2015-09-236-35/+67
|\ \ \ \ \ \
| * | | | | | Fixed taking precision into count when assigning a value to timestamp attributeBogdan Gusiev2015-09-236-35/+67
* | | | | | | Merge pull request #21732 from amitsuroliya/mime_docsAbdelkader Boudih2015-09-232-6/+6
|\ \ \ \ \ \ \