aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove unused codeAaron Patterson2015-06-081-2/+2
* we only care about methods that the request object responds toAaron Patterson2015-06-081-2/+1
* extract required_defaults from the conditions hash before constructing the routeAaron Patterson2015-06-086-56/+56
* Merge pull request #20479 from masarakki/no-scaffold.css-optionRafael Mendonça França2015-06-083-1/+18
|\
| * add option to avoid generating scaffold.cssmasarakki2015-06-093-1/+18
|/
* Merge pull request #20124 from greysteil/fix-select-helperRafael Mendonça França2015-06-083-3/+21
|\
| * Raise an ArgumentError when `include_blank` is false for a required field inGrey Baker2015-06-083-3/+21
|/
* Merge pull request #20463 from yui-knk/fix/guide1Zachary Scott2015-06-082-2/+2
|\
| * [ci skip] Fix hours to minutes in `select_minute`yui-knk2015-06-072-2/+2
* | Merge pull request #20470 from vngrs/add_missing_docs_for_action_dispatch_ses...Zachary Scott2015-06-081-0/+33
|\ \
| * | Add missing documentation for ActionDispatch::Request::Session [ci skip]Mehmet Emin İNAÇ2015-06-071-0/+33
* | | Merge pull request #20381 from kuldeepaggarwal/engines-docsYves Senn2015-06-081-5/+5
|\ \ \
| * | | [ci skip]fix docs for EnginesKuldeep Aggarwal2015-05-301-5/+5
* | | | Merge pull request #19571 from kaspth/improve-runner-integrationYves Senn2015-06-0812-293/+298
|\ \ \ \
| * | | | Improve test runner's Minitest integration.Kasper Timm Hansen2015-06-0412-293/+298
* | | | | Merge pull request #20476 from hanachin/fix-core_textKasper Timm Hansen2015-06-081-1/+1
|\ \ \ \ \
| * | | | | Fix core_text -> core_extSeiei Miyagi2015-06-081-1/+1
|/ / / / /
* | | | | Merge pull request #20474 from asanghi/patch-1Arun Agrawal2015-06-081-1/+1
|\ \ \ \ \
| * | | | | Code fix in CHANGELOGAditya Sanghi2015-06-081-1/+1
|/ / / / /
* | | | | Merge pull request #20460 from mtsmfm/stop-to-s-for-fixture-timestampsSean Griffin2015-06-071-1/+0
|\ \ \ \ \
| * | | | | Stop `to_s(:db)` for fixture's timestampFumiaki MATSUSHIMA2015-06-071-1/+0
* | | | | | Merge pull request #20471 from y-yagi/add_instantiation_to_instrumentation_guideZachary Scott2015-06-071-0/+14
|\ \ \ \ \ \
| * | | | | | add `instantiation.active_record` hook to instrumentation guide [ci skip]yuuji.yaginuma2015-06-081-0/+14
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #20472 from Coaxial/patch-1Zachary Scott2015-06-071-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add missing NOTE for Time extensions' locationPierre2015-06-071-0/+2
|/ / / / /
* | | | | Merge pull request #20448 from sgrif/sg-postgresql-point-typeSean Griffin2015-06-076-11/+189
|\ \ \ \ \
| * | | | | Return a `Point` object from the PG Point typeSean Griffin2015-06-056-11/+189
* | | | | | Merge pull request #20464 from ronakjangir47/active_support_stubbingArthur Nogueira Neves2015-06-0710-309/+366
|\ \ \ \ \ \
| * | | | | | Removed mocha stubbing in active_supportRonak Jangir2015-06-0710-309/+366
| | |/ / / / | |/| | | |
* | | | | | Tiny documentation edits [ci skip]Robin Dupret2015-06-073-4/+7
* | | | | | Merge pull request #20004 from rusikf/patch-1Robin Dupret2015-06-071-0/+31
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | add docs to include option at ActiveModel::Serialization#serializable_hash [c...rusikf2015-05-111-0/+31
* | | | | | A few documentation tweaks [ci skip]Robin Dupret2015-06-079-14/+22
* | | | | | Merge pull request #20462 from yui-knk/fix/guide3Robin Dupret2015-06-071-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [ci skip] Declare `product` as `_product partial`yui-knk2015-06-071-1/+2
|/ / / / /
* | | | | Merge pull request #20456 from akihiro17/fix-bug-reportRafael Mendonça França2015-06-066-6/+36
|\ \ \ \ \
| * | | | | Output an error message and raise an error if bundler 1.10.x is not installed...akihiro172015-06-066-6/+36
|/ / / / /
* | | | | Merge pull request #20423 from Erol/remove-assets-version-documentationRafael Mendonça França2015-06-061-2/+0
|\ \ \ \ \
| * | | | | Remove reference to assets version option.Erol Fornoles2015-06-031-2/+0
* | | | | | Merge pull request #20444 from y-yagi/can_use_path_helper_method_in_consoleRafael Mendonça França2015-06-062-0/+17
|\ \ \ \ \ \
| * | | | | | modify console of app method in that can use the path helpersyuuji.yaginuma2015-06-052-0/+17
| |/ / / / /
* | | | | | Merge pull request #20452 from repinel/add-bug-report-templates-to-ciRafael Mendonça França2015-06-056-17/+49
|\ \ \ \ \ \
| * | | | | | Add the bug report templates to the Travis CI buildRoque Pinel2015-06-056-17/+49
* | | | | | | Merge pull request #20442 from arunagw/aa-remove-warning-eager-loadRafael Mendonça França2015-06-051-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove warning for setting eager_loadArun Agrawal2015-06-051-1/+1
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-06-055-8/+8
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | [ci skip] Add `.`yui-knk2015-06-011-1/+1
| * | | | | | [ci skip] Upcase `is`yui-knk2015-05-251-1/+1
| * | | | | | [ci skip] Fix typo you/yourclaudiob2015-05-231-1/+1
| * | | | | | [ci skip] Upcase `when`yui-knk2015-05-161-1/+1