aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Revert "Grammar correction"Matthew Draper2015-06-111-1/+1
* | | | | | | | | | Merge pull request #20517 from hemalijain/patch-1Kasper Timm Hansen2015-06-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Grammar correctionhemali jain2015-06-111-1/+1
|/ / / / / / / / /
* | | | | | | | | Revert "Add code example for include option of AM::Serialization#serializable...Rafael Mendonça França2015-06-101-14/+1
* | | | | | | | | Merge pull request #20500 from repinel/use-block-not-global-varRafael Mendonça França2015-06-092-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use block variable instead of globalRoque Pinel2015-06-092-3/+3
|/ / / / / / / / /
* / / / / / / / / Add code example for include option of AM::Serialization#serializable_hashRadan Skoric2015-06-091-1/+14
|/ / / / / / / /
* | | | | | | | Merge pull request #20496 from prathamesh-sonpatki/rm-noteArun Agrawal2015-06-091-4/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove NOTE related to format.js [ci skip]Prathamesh Sonpatki2015-06-091-4/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #20493 from dansteele/patch-1Zachary Scott2015-06-091-24/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed AJAX example with poor convention adherenceDaniel Steele2015-06-091-24/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #20437 from pwnall/abstract_fixturesRafael Mendonça França2015-06-095-1/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix crash when loading fixture with belongs_to association defined in abstrac...Victor Costan2015-06-045-1/+31
* | | | | | | | | Merge pull request #20491 from Gaurav2728/gaurav-command_line_guideArun Agrawal2015-06-091-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | update Rails Command Line guide pageGaurav Sharma2015-06-091-2/+2
|/ / / / / / / /
* | | | | | | | Tiny documentation edits [ci skip]Robin Dupret2015-06-092-8/+8
* | | | | | | | Merge pull request #20483 from davydovanton/fix-typo-am-testRafael Mendonça França2015-06-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo in AM I18n validation test name [skip ci]Anton Davydov2015-06-091-1/+1
* | | | | | | | | Merge pull request #20486 from repinel/improve-gsub-and-global-varsRafael Mendonça França2015-06-081-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use block variable instead of globalRoque Pinel2015-06-081-1/+1
|/ / / / / / / / /
* | | | | | | | | 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