aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3-2-15' into 3-2-secAaron Patterson2013-10-1516-28/+30
|\
| * bumping to rc3Aaron Patterson2013-10-119-9/+9
| * Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"Rafael Mendonça França2013-10-104-10/+2
| * Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"Rafael Mendonça França2013-10-102-14/+0
| * bumping to rc2Aaron Patterson2013-10-049-9/+9
| * Merge pull request #12443 from arthurnn/add_inverse_of_add_targetRafael Mendonça França2013-10-042-0/+14
| * bumping version to 3.2.15.rc1Aaron Patterson2013-10-039-17/+17
| * Merge pull request #12084 from Ben-M/3-2-stableAaron Patterson2013-10-033-1/+11
| |\
| | * Fix STI scopes using benolee's suggestion. Fixes #11939Ben Maraney2013-08-303-1/+11
* | | Merge branch '3-2-stable' into 3-2-secAaron Patterson2013-10-037-3/+29
|\| |
| * | Merge pull request #12410 from tamird/fix-ip-spoof-errorsAndrew White2013-10-013-1/+19
| |\ \
| | * | make sure both headers are set before checking for ip spoofingTamir Duberstein2013-10-013-1/+19
| |/ /
| * | Merge pull request #12413 from arthurnn/inverse_of_on_buildRafael Mendonça França2013-09-304-2/+10
| |\ \
| | * | Move set_inverse_instance to association.build_recordArthur Neves2013-09-304-2/+10
| |/ /
* / / Remove the use of String#% when formatting durations in log messagesMichael Koziarski2013-09-303-9/+12
|/ /
* | Merge pull request #12375 from arthurnn/inverse_after_find_or_initializeRafael Mendonça França2013-09-283-4/+22
|\ \
| * | fix inverse_of when find_or_initialize_by_*Arthur Neves2013-09-263-4/+22
* | | Use Ruby 1.8 hash syntaxRafael Mendonça França2013-09-281-2/+2
|/ /
* | Merge pull request #12364 from arthurnn/test_fix_validateRafael Mendonça França2013-09-252-2/+5
|\ \
| * | on tests: dont always touch firm on validateArthur Neves2013-09-252-2/+5
|/ /
* | Merge pull request #12359 from arthurnn/inverse_on_callbacksRafael Mendonça França2013-09-254-1/+18
* | Merge pull request #12196 from h-lame/fix-activesupport-cache-filestore-cleanupRafael Mendonça França2013-09-123-1/+18
* | Fix FinderMethods#last unscoped primary keyEugene Kalenkovich2013-09-124-3/+21
* | Merge pull request #9368 from CrowdFlower/3-2-stableSteve Klabnik2013-09-104-4/+25
|\ \
| * | pass the extra params to the rack test environment so that routes with block ...Brian Hahn2013-09-064-4/+25
| |/
* | Merge pull request #12176 from arthurnn/ar32_schema_cacheSantiago Pastorino2013-09-101-2/+2
|\ \ | |/ |/|
| * on SchemaCache use the connection getter instead of the obj givenArthur Neves2013-09-091-2/+2
|/
* Merge pull request #12048 from tjouan/app_generator-bin_perms-umaskAaron Patterson2013-08-271-1/+1
* Merge pull request #12006 from kassio/11605-render-with-context-formatRafael Mendonça França2013-08-2512-31/+16
|\
| * fix issue #11605Kassio Borges2013-08-2412-31/+16
|/
* Fix 1.8.7 incompatible respond_to_missingEugene Kalenkovich2013-08-181-2/+8
* Merge pull request #11930 from UncleGene/ties_testGuillermo Iguaran2013-08-181-4/+4
|\
| * Fix test incompatible with 1.8.7Eugene Kalenkovich2013-08-181-4/+4
|/
* Make `rake doc:guides` works again. Fix #10384.Teng Siong Ong2013-08-052-3/+3
* Merge pull request #11765 from kassio/load-fixtures-from-linked-folderRafael Mendonça França2013-08-054-3/+8
|\
| * Load fixtures from linked foldersKassio Borges2013-08-054-3/+8
|/
* Move changelog entry to the top [ci skip]Rafael Mendonça França2013-07-301-5/+8
* Fix broken testRafael Mendonça França2013-07-241-1/+1
* Tidy up the "Specified column type for quote_value" changesBen Woosley2013-07-242-3/+3
* Specified column type for quote_valueAlfred Wong2013-07-243-1/+24
* Merge pull request #11563 from 90yukke/fix-nomethoderror-on-non-attribute-equ...Rafael Mendonça França2013-07-233-2/+23
|\
| * Fix merge error when Equality LHS is non-attribute.90yukke2013-07-233-2/+23
|/
* Fix actionpack CHANGELOG entryRafael Mendonça França2013-07-221-1/+4
* Merge branch '3-2-14' into 3-2-stableRafael Mendonça França2013-07-2216-16/+24
|\
| * Fix activemodel CHANGELOGRafael Mendonça França2013-07-221-6/+1
| * Preparing for 3.2.14 releaseRafael Mendonça França2013-07-229-9/+9
| * Update CHANGELOG entryRafael Mendonça França2013-07-226-34/+6
| * Preparing for 3.2.14.rc2 releaseRafael Mendonça França2013-07-1616-17/+47
| * Use Ruby 1.8 syntaxRafael Mendonça França2013-07-151-1/+1
| * Merge pull request #11451 from jetthoughts/11450_do_not_resave_destroyed_asso...Yves Senn2013-07-153-0/+18
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 22:30:13 +0000