aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14728 from stomar/assertion-msgYves Senn2014-04-152-14/+16
|\
| * Refine tests for assert_select failure messagesMarcus Stollsteimer2014-04-141-11/+13
| * Remove surplus period from assertion messagesMarcus Stollsteimer2014-04-131-3/+3
* | Merge pull request #14642 from tgxworld/fix_notifications_not_unsubscribingYves Senn2014-04-152-6/+9
|\ \
| * | Fix subscriptions not being unsubscribed.Guo Xiang Tan2014-04-142-6/+9
* | | Make console and generators blocks works at Application instance levelRafael Mendonça França2014-04-144-0/+114
* | | :scissors:Rafael Mendonça França2014-04-141-4/+4
* | | Return null type format when format is not knowRafael Mendonça França2014-04-143-1/+13
* | | Remove outdated commentRafael Mendonça França2014-04-141-1/+0
* | | Merge pull request #14729 from akshay-vishnoi/doc_changesRichard Schneeman2014-04-142-7/+7
|\ \ \
| * | | [ci skip] Improve doc, fix grammatical issueAkshay Vishnoi2014-04-132-7/+7
| | |/ | |/|
* | | Merge pull request #14735 from byroot/idempotent-counter-cachesAaron Patterson2014-04-143-4/+47
|\ \ \
| * | | Make counter cache decrementation on destroy idempotentJean Boussier2014-04-132-4/+26
| * | | Write the failing test case for concurrent counter cacheJean Boussier2014-04-131-0/+21
* | | | Merge pull request #14746 from zenati/masterYves Senn2014-04-141-1/+1
|\ \ \ \
| * | | | [ci skip] Added link to ruby-lang.org installation.ZENATI YASSINE2014-04-141-1/+1
* | | | | Use the index on hidden fieldRafael Mendonça França2014-04-141-1/+1
* | | | | Merge pull request #14736 from nashby/hidden-indexRafael Mendonça França2014-04-143-4/+26
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | `collection_check_boxes` respects `:index` option for the hidden filed name.Vasiliy Ermolovich2014-04-143-4/+26
| |/ / /
* | | | docs, double meaning of `serialize` argument. Closes #14284.Yves Senn2014-04-141-5/+16
* | | | Merge pull request #14739 from oysta/guide-fixesYves Senn2014-04-141-2/+2
|\ \ \ \
| * | | | - Fix lingering reference to `:text` instead of the newer `:plain`Christopher Owen2014-04-141-2/+2
* | | | | Merge pull request #14740 from laurocaetano/read-attributeRafael Mendonça França2014-04-142-7/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Just call read_attribute, no need to use `send`.Lauro Caetano2014-04-142-7/+7
|/ / / /
* | | | again, read_attribute is public, so just call itAaron Patterson2014-04-131-1/+1
* | | | read_attribute is public, so we should just call itAaron Patterson2014-04-131-1/+1
* | | | Merge pull request #14737 from nickborromeo/disable-asset-cache-docsArthur Nogueira Neves2014-04-131-0/+8
|\ \ \ \
| * | | | Disable assest cache store in docs [ci skip]Nick Borromeo2014-04-131-0/+8
|/ / / /
* | | | Merge pull request #14732 from JuanitoFatas/doc/patch1Robin Dupret2014-04-134-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Use plain underscore instead of "\_".Juanito Fatas2014-04-134-5/+5
|/ / /
* | | Merge pull request #14592 from laurocaetano/equality_between_relation_and_col...Rafael Mendonça França2014-04-134-0/+54
|\ \ \
| * | | Ensure that the comparison between 'CollectionProxy' and 'AssociationRelation...Lauro Caetano2014-04-121-0/+9
| * | | Make the comparison between 'Relation' and 'AssociationRelation'Lauro Caetano2014-04-123-1/+14
| * | | The comparison between `Relation` and `CollectionProxy` should be consistent.Lauro Caetano2014-04-113-0/+32
* | | | Merge pull request #14726 from akshay-vishnoi/structural-changeRafael Mendonça França2014-04-132-0/+0
|\ \ \ \
| * | | | Move tests for deep_dup and duplicable to object directoryAkshay Vishnoi2014-04-132-0/+0
| | |/ / | |/| |
* | | | Merge pull request #14722 from maurogeorge/mg-readonly-collectionSantiago Pastorino2014-04-132-1/+45
|\ \ \ \
| * | | | CollectionHelpers now accepts a readonly optionMauro George2014-04-122-1/+45
* | | | | Merge pull request #14718 from mcmorgan/update-documentation-to-match-generat...Santiago Pastorino2014-04-1318-25/+24
|\ \ \ \ \
| * | | | | Update documentation to use Rails.application insteadMarcel Morgan2014-04-1318-25/+24
| | |/ / / | |/| | |
* | | | | Merge pull request #14727 from robin850/patch-17Yves Senn2014-04-131-0/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add a changelog entry for #14546 [ci skip]Robin Dupret2014-04-131-0/+14
|/ / / /
* | | | Merge pull request #14725 from afshinator/patch-1Richard Schneeman2014-04-121-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Missing 'are' in note - [ci skip]Afshin Mokhtari2014-04-121-1/+1
|/ / /
* | | Fix a few typos [ci skip]Robin Dupret2014-04-121-13/+13
* | | Merge pull request #14720 from philr/tzinfo_data_x64_mingwRafael Mendonça França2014-04-121-1/+1
|\ \ \
| * | | Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows).Phil Ross2014-04-121-1/+1
|/ / /
* | | don't bother with an offset if the offset is zeroAaron Patterson2014-04-121-6/+9
* | | only add the offset and index when we need toAaron Patterson2014-04-121-8/+9
* | | remove branching logic from calls to find_nthAaron Patterson2014-04-121-6/+10
|/ /