aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* don't change class definition in test caseJosh Susser2011-11-292-6/+4
|
* avoid warningsJosh Susser2011-11-276-15/+15
| | | | | | | This change uses Module.redefine_method as defined in ActiveSupport. Making Module.define_method public would be as clean in the code, and would also emit warnings when redefining an association. That is pretty messy given current tests, so I'm leaving it for someone else to decide what approach is better.
* 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
| | | | | | | | | | Instead of generating association methods directly in the model class, they are generated in an anonymous module which is then included in the model class. There is one such module for each association. The only subtlety is that the generated_attributes_methods module (from ActiveModel) must be forced to be included before association methods are created so that attribute methods will not shadow association methods.
* Revert "Merge pull request #3640 from indirect/remote_ip"Jon Leighton2011-11-152-8/+6
| | | | | | | | This reverts commit 6491aadc525b8703708e0fd0fbf05bd436a47801, reversing changes made to 83bf0b626cf2134260903e57d74f67de57384073. See https://github.com/rails/rails/pull/3640#issuecomment-2752761 for explanation.
* Merge pull request #3640 from indirect/remote_ipYehuda Katz2011-11-152-6/+8
|\ | | | | GetIp#to_s should never return nil. That's icky.
| * 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
|\ | | | | unit test for fix from a few minutes ago
| * 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
|\ | | | | Force calculation of remote IP before using || operator
| * Return the calculated remote_ip or ipAndre Arko2011-11-141-1/+2
| | | | | | This was an especially nasty bug introduced in 317f4e2, by the way that an instance of GetIp is not nil, but GetIp#to_s could sometimes return nil. Gross, huh?
| * 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 JRuby
| * 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?
| * | 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.
| * | | 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.0
| * | | Upgrade Sprockets to 2.1.0Guillermo Iguaran2011-11-141-1/+1
| | |/ | |/| | | | | | | This version brings bug fixes for performance and caching.
* | | 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 #3609
| * | | Fix pull request #3609Noé Froidevaux2011-11-131-1/+1
| |/ /
* | | Merge pull request #3623 from indirect/remote_ipJosé Valim2011-11-132-6/+6
|\ \ \ | | | | | | | | Remote IP fixes/cleanup
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | next section" This reverts commit 4bf057b8661754948681a18cf17ff5676518d774. Reason: Prefer to keep the configuration of all databases at the same level
| * | | Revert "Use rails help new instead of rails new -h"Vijay Dev2011-11-131-1/+2
| | | | | | | | | | | | | | | | This reverts commit 6ac65c92029d3eefd101f9458d86bae0314cd14c.
| * | | Revert "Update guide to use Ruby 1.9 hash syntax"Vijay Dev2011-11-131-43/+45
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 50a9de514f8724b04d3681aa9ca228a8ca490909. Reason: Let's keep the guides at 1.8 syntax
| * | | 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
| | | | | | | | | | | | - Changed Rails 3.0 to 3.0+
| * | | Be explicit about changing codeJason Noble2011-11-131-2/+2
| | | |