aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19818 from chancancode/generic_bug_report_templateEileen M. Uchitelle2015-04-192-0/+41
|\
| * Add a "generic" bug report templateGodfrey Chan2015-04-192-0/+41
|/
* Merge pull request #19817 from tpitale/4_2-release-notes-fixRafael Mendonça França2015-04-191-3/+2
|\
| * Update 4_2_release_notes.mdTony Pitale2015-04-191-3/+2
* | Use _read_attribute(primary_key) instead of idRafael Mendonça França2015-04-191-1/+1
* | Merge pull request #19783 from vngrs/raise_error_on_touch_if_object_is_staleSean Griffin2015-04-192-3/+25
|\ \ | |/ |/|
| * Raise StaleObjectError if touched object is stale and locking is enabledMehmet Emin İNAÇ2015-04-192-3/+25
* | Merge pull request #19814 from y-yagi/array_inquiryRafael Mendonça França2015-04-191-0/+2
|\ \
| * | add missing require for ArrayInquireryuuji.yaginuma2015-04-191-0/+2
* | | Merge pull request #19799 from yui-knk/fix/wrap_doc2Arthur Nogueira Neves2015-04-192-5/+6
|\ \ \
| * | | [ci skip] Fix docs and guide about 'Array.wrap'yui-knk2015-04-192-5/+6
* | | | Merge pull request #19812 from piton4eg/patch-1Robin Dupret2015-04-191-1/+1
|\ \ \ \
| * | | | Update association_basics.mdMarkov Alexey2015-04-191-1/+1
| | |/ / | |/| |
* | | | Merge pull request #19811 from prathamesh-sonpatki/fix-aj-guideRobin Dupret2015-04-191-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Spell out "asynchronously" instead of async in guides [ci skip]Prathamesh Sonpatki2015-04-191-1/+1
|/ / /
* | | Autosave existing records on HMT associations when the parent is newSean Griffin2015-04-183-6/+21
* | | Merge pull request #19787 from Senjai/patch-2Yves Senn2015-04-181-5/+4
|\ \ \
| * | | Encourage users to user super to override methods.Richard Wilson2015-04-161-5/+4
| | |/ | |/|
* | | Merge pull request #19806 from vircung/masterYves Senn2015-04-181-0/+23
|\ \ \
| * | | Improve documentation [ci skip]Jacek Nakonieczny2015-04-181-0/+25
|/ / /
* | | Merge pull request #19802 from sikachu/add-missing-requireRafael Mendonça França2015-04-171-0/+1
|\ \ \
| * | | Add missing require for String#strip_heredocPrem Sichanugrist2015-04-171-0/+1
|/ / /
* | | Merge pull request #19800 from yui-knk/fix/wrap_doc3Abdelkader Boudih2015-04-172-2/+2
|\ \ \ | |_|/ |/| |
| * | [ci skip] Replace `list` with `array`yui-knk2015-04-182-2/+2
|/ /
* | Merge pull request #19795 from yui-knk/fix/without_guideAbdelkader Boudih2015-04-171-1/+1
|\ \ | |/ |/|
| * [ci skip] Update code example of Enumerable#withoutyui-knk2015-04-171-1/+1
|/
* Merge pull request #19780 from 10io/active_job_testingAbdelkader Boudih2015-04-161-0/+7
|\
| * add active job testing section [ci skip]David Fernandez2015-04-161-0/+7
|/
* Merge pull request #19778 from thenickcox/commands_docsRichard Schneeman2015-04-161-0/+11
|\
| * [ci skip] Document running a rake command as a rails commandNick Cox2015-04-151-0/+11
|/
* Merge pull request #19775 from vngrs/fix_typo_asser_urlAbdelkader Boudih2015-04-151-6/+6
|\
| * fix typo asser url [ci skip]Mehmet Emin İNAÇ2015-04-161-6/+6
|/
* Merge pull request #19774 from davydovanton/doc-update-asser-urlAbdelkader Boudih2015-04-151-0/+30
|\
| * [Skip ci] Add information about :host optionsAnton Davydov2015-04-161-0/+30
* | Merge pull request #19766 from blasterpal/small_typo_in_asset_pipelineRafael Mendonça França2015-04-151-1/+1
|\ \
| * | Correct small typo.Hank Beaver2015-04-151-1/+1
* | | Merge pull request #19765 from y-yagi/fix_typo_in_form_builderKasper Timm Hansen2015-04-151-1/+1
|\ \ \ | |/ / |/| |
| * | remove extra `=` in form builder example [ci skip]yuuji.yaginuma2015-04-151-1/+1
|/ /
* | Merge pull request #19763 from jonatack/fix-typos-in-docsYves Senn2015-04-1511-29/+55
|\ \
| * | Fix typos and improve the documentationJon Atack2015-04-1511-29/+55
* | | Revert "Merge pull request #19755 from yuki24/activerecord/support-for-set"Yves Senn2015-04-153-15/+0
|/ /
* | Merge pull request #19446 from andersonDadario/fix_security_guide_captcha_03_...Zachary Scott2015-04-141-4/+6
|\ \
| * | [ci skip] Fix for Security Guide - Captcha SectionAnderson Dadario2015-03-221-4/+6
* | | Merge pull request #19757 from Strech/http-auth-realm-unquotingArthur Nogueira Neves2015-04-141-2/+2
|\ \ \
| * | | Tiny optimization of http auth Realm unquotingStrech (Sergey Fedorov)2015-04-141-2/+2
* | | | Merge pull request #19752 from yuki24/use-prepend-rather-than-aliasCarlos Antonio da Silva2015-04-142-42/+36
|\ \ \ \
| * | | | Use #prepend rather than using 2 aliasesYuki Nishijima2015-04-142-42/+36
* | | | | Enable Active Job integration tests againRafael Mendonça França2015-04-141-1/+0
* | | | | avoid double initialization error caused to sidekiqTakumi IINO2015-04-141-13/+34
* | | | | Merge pull request #19758 from andreynering/remove-gzip-docRafael Mendonça França2015-04-141-35/+0
|\ \ \ \ \