aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rename nested_has_many_through_associations_test.rb because it does not only ...Jon Leighton2010-10-191-1/+1
* Add explicit ordering in relations_test.rb, as the lack of this was causing f...Jon Leighton2010-10-191-9/+9
* Add explicit ordering to nested_has_many_through_associations_test.rb as this...Jon Leighton2010-10-191-32/+37
* Remove obsolete require to active_record/associations/nested_has_many_throughJon Leighton2010-10-191-1/+0
* Fix typoJon Leighton2010-10-191-1/+1
* Remove obsolete autoloadJon Leighton2010-10-191-1/+0
* Add a CHANGELOG entry about nested through associationsJon Leighton2010-10-191-0/+2
* Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-1967-1408/+2386
|\
| * "instance_methods" includes public and protectedAaron Patterson2010-10-191-1/+1
| * adds the new :data idiom in tag helpers to the CHANGELOGXavier Noria2010-10-191-0/+7
| * Additional documentation for data-* attributes.Stephen Celis & Xavier Noria2010-10-191-10/+17
| * Use ALTER INDEX syntax to rename an indexMichał Łomnicki2010-10-191-0/+4
| * avoid a few comparisonsAaron Patterson2010-10-181-3/+3
| * Fix status initialization when custom status providedKrekoten' Marjan2010-10-182-2/+6
| * AC::Caching DRYupKrekoten' Marjan2010-10-181-5/+1
| * remove strange else blockAaron Patterson2010-10-181-9/+7
| * skip extra work if no text or phrase was providedAaron Patterson2010-10-181-12/+11
| * lets not invert the hash on every iteration through this loopAaron Patterson2010-10-181-1/+3
| * use -= in place of the expanded formAaron Patterson2010-10-181-1/+1
| * implicitly return nil if there is no numberAaron Patterson2010-10-181-2/+2
| * implicit return of nilAaron Patterson2010-10-181-1/+1
| * use regex escape sequences to shorten stuff upAaron Patterson2010-10-181-2/+2
| * join strings rather than resizing bufferAaron Patterson2010-10-181-2/+2
| * Call html_escape in ERB::Util module and don't mix it in in the helpersSantiago Pastorino2010-10-187-20/+24
| * explains why ERB::Util#h is removed before being re-aliasedXavier Noria2010-10-181-0/+1
| * Use mysql2 from git for a whileSantiago Pastorino2010-10-181-1/+2
| * Invoke html_escape on the proper receiverSantiago Pastorino2010-10-181-1/+1
| * Merge CHANGELOGs from 3-0-stableSantiago Pastorino2010-10-187-0/+24
| * Tidy up a bit this codeSantiago Pastorino2010-10-181-4/+6
| * Why strip only the extension, this can be done by the userSantiago Pastorino2010-10-181-1/+1
| * This or login doesn't make senseSantiago Pastorino2010-10-181-3/+3
| * Use unless instead of if nil?Santiago Pastorino2010-10-181-1/+1
| * Add missing requireSantiago Pastorino2010-10-181-0/+1
| * Reset assert_template instance variables between requests [#5832 state:resolved]Andrew White2010-10-182-0/+15
| * Change def to attr_reader + aliasKrekoten' Marjan2010-10-181-10/+3
| * parse number only if options[:raise] is providedSantiago Pastorino2010-10-171-4/+2
| * number_to_phone always return safeSantiago Pastorino2010-10-172-5/+3
| * Rejig the html5 data helper codeMichael Koziarski2010-10-181-3/+5
| * HTML5 data attribute helpers [#5825 state:resolved].Stephen Celis2010-10-182-4/+24
| * No need for parenthesis hereSantiago Pastorino2010-10-171-1/+1
| * no need to check for nilNeeraj Singh2010-10-172-4/+4
| * replace if ! with unlessNeeraj Singh2010-10-177-7/+7
| * Bump bundler up to 1.0.3Santiago Pastorino2010-10-162-2/+2
| * extract formats_regexp as a methodSantiago Pastorino2010-10-161-2/+5
| * There's no need now to expose lookup_context as an external APISantiago Pastorino2010-10-161-3/+1
| * Delegate freeze_formats to lookup_contextSantiago Pastorino2010-10-162-4/+4
| * Remove the :vew attr_reader from ActionView::AbstractRenderer [#5819 state:re...Jeff Kreeftmeijer2010-10-161-1/+1
| * JQuery updated to 1.4.3Santiago Pastorino2010-10-161-1230/+2035
| * implements weeks_ago and prev_week for Date/DateTime/Time [#5122 state:commit...Rob Zolkos & Xavier Noria2010-10-167-5/+100
| * delete from :number until the endSantiago Pastorino2010-10-151-1/+1