aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* changelog & docs for GeneratedFeatureMethodsJosh Susser2011-11-272-0/+26
* use GeneratedFeatureMethods module for associationsJosh Susser2011-11-277-15/+57
* add test for super-ing to association methodsJosh Susser2011-11-151-2/+12
* association methods are now generated in modulesJosh Susser2011-11-159-30/+43
* Revert "Merge pull request #3640 from indirect/remote_ip"Jon Leighton2011-11-152-8/+6
* Merge pull request #3640 from indirect/remote_ipYehuda Katz2011-11-152-6/+8
|\
| * GetIp#to_s should never return nil. That's icky.Andre Arko2011-11-142-6/+8
* | refactor test_multiple_ofVijay Dev2011-11-161-4/+3
|/
* Merge pull request #3632 from indirect/b8c85deJon Leighton2011-11-141-0/+5
|\
| * add test for bug fixed in 4f2bf64Andre Arko2011-11-141-0/+5
|/
* Merge pull request #3631 from indirect/remote_ipJosé Valim2011-11-142-8/+15
|\
| * Return the calculated remote_ip or ipAndre Arko2011-11-141-1/+2
| * memoize the relatively expensive remote IP codeAndre Arko2011-11-141-1/+7
| * cleaner namesAndre Arko2011-11-141-6/+6
|/
* Speed up attribute invocation by checking if both name and calls are compilable.José Valim2011-11-143-29/+34
* Merge pull request #3626 from guilleiguaran/include-therubyrhino-gemfileJosé Valim2011-11-142-0/+8
|\
| * Added therubyrhino to default Gemfile under JRubyGuillermo Iguaran2011-11-142-0/+8
* | Merge pull request #3628 from oscardelben/refactoringYehuda Katz2011-11-141-1/+1
|\ \
| * | use any? instead of !empty?Oscar Del Ben2011-11-141-1/+1
* | | Add a note to REALEASING_RAILS about testing the gem locally before releasingJon Leighton2011-11-141-0/+9
* | | rake release should push the tagJon Leighton2011-11-141-0/+1
* | | Merge pull request #3371 from yahonda/fix_ora_00932_errorAaron Patterson2011-11-141-1/+1
|\ \ \
| * | | Fix ORA-00932 error when trying to insert 0 to DATE type columns.Yasuo Honda2011-10-191-1/+1
* | | | Sync changelog entryJon Leighton2011-11-141-0/+2
* | | | Add note about checking postgres tests before releaseJon Leighton2011-11-141-0/+8
| |/ / |/| |
* | | Merge pull request #3625 from guilleiguaran/sprockets-2.1.0Jon Leighton2011-11-141-1/+1
|\ \ \
| * | | Upgrade Sprockets to 2.1.0Guillermo Iguaran2011-11-141-1/+1
| | |/ | |/|
* | | Add note about syncing CHANGELOGsJon Leighton2011-11-141-0/+4
* | | Sync CHANGELOGs from 3-1-stableJon Leighton2011-11-143-0/+42
* | | Merge pull request #3622 from noefroidevaux/issue_3595Yehuda Katz2011-11-131-1/+1
|\ \ \
| * | | Fix pull request #3609Noé Froidevaux2011-11-131-1/+1
| |/ /
* | | Merge pull request #3623 from indirect/remote_ipJosé Valim2011-11-132-6/+6
|\ \ \
| * | | remove ignored flag, fixes warningsAndre Arko2011-11-131-1/+1
| * | | turns out the tests expect remote_addrs.firstAndre Arko2011-11-131-1/+1
| * | | correctly raise IpSpoofAttackError messageAndre Arko2011-11-131-2/+2
| * | | change tests to expect X-F-F over REMOTE_ADDRAndre Arko2011-11-131-2/+2
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-139-84/+100
|\ \ \
| * | | copy edits in getting started guideVijay Dev2011-11-131-15/+12
| * | | Revert "Move Tip up higher so users who are fine with SQLite can skip to the ...Vijay Dev2011-11-131-18/+16
| * | | Revert "Use rails help new instead of rails new -h"Vijay Dev2011-11-131-1/+2
| * | | Revert "Update guide to use Ruby 1.9 hash syntax"Vijay Dev2011-11-131-43/+45
| * | | Update guide to use Ruby 1.9 hash syntaxJason Noble2011-11-131-45/+43
| * | | Add output for add_index commandJason Noble2011-11-131-2/+4
| * | | Convert tables to table formatJason Noble2011-11-131-10/+13
| * | | Grammar changeJason Noble2011-11-131-1/+1
| * | | Be explicit on where the show.html.erb is locatedJason Noble2011-11-131-1/+1
| * | | Make the guide more friendlyJason Noble2011-11-131-8/+10
| * | | Be explicit about changing codeJason Noble2011-11-131-2/+2
| * | | p.errors.full_messages is a little more human readableJason Noble2011-11-131-4/+2
| * | | Add link to AR Validations and Callbacks to further explain validationsJason Noble2011-11-131-1/+2