aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2948 from atambo/masterAaron Patterson2011-11-161-38/+66
|\
| * schema_format :sql should behave like schema_format :rubyAlex Tambellini2011-11-041-38/+66
* | Switch from marshal format to plain text for the encoding conversions dump. T...Jon Leighton2011-11-163-6/+95
* | fixing tests on PGAaron Patterson2011-11-161-1/+1
* | bundler treats trunk ruby as ruby 1.9, hack around that for nowAaron Patterson2011-11-161-1/+1
* | Substituted RailsCommands for Rails::CommandsDaniel Dyba2011-11-161-159/+161
* | Changed Commands module to RailsCommands.Daniel Dyba2011-11-161-3/+3
* | Merge pull request #3634 from RyanNaughton/fixes_3483Aaron Patterson2011-11-162-6/+12
|\ \
| * | Fixes issue #3483, regarding using a mixture of ranges and discrete values in...Ryan Naughton2011-11-142-7/+9
| * | Failing test case for issue #3483Gabriel Sobrinho2011-11-141-0/+4
* | | 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