aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* updating API docstring so that user can infer default valuegregolsen2011-11-172-4/+4
* update guide: db:structure:dump produces structure.sql nowVijay Dev2011-11-181-1/+1
* Revert "Merge pull request #1163 from amatsuda/sexier_migration_31"Aaron Patterson2011-11-174-142/+13
* Revert "Merge pull request #3603 from vijaydev/change_table_without_block_arg"Aaron Patterson2011-11-172-66/+7
* Merge pull request #3663 from atambo/masterJosé Valim2011-11-174-10/+10
|\
| * Move schema_format :sql config setting from test.rb to application.rbAlex Tambellini2011-11-174-10/+10
|/
* Merge pull request #3654 from wildchild/label_i18nJosé Valim2011-11-172-1/+55
|\
| * Fix impractical I18n lookup in nested fields_forAlexander Uvarov2011-11-172-1/+55
* | Merge pull request #3658 from arunagw/fix_initialize_var_nameVijay Dev2011-11-161-1/+1
|\ \
| * | It should be @calculated_ip not @calculate_ipArun Agrawal2011-11-171-1/+1
|/ /
* | Merge pull request #3656 from arunagw/readline_to_readVijay Dev2011-11-161-1/+1
|\ \ | |/ |/|
| * No need to `readlines` then `join`, just use `read` :heart:Arun Agrawal2011-11-171-1/+1
|/
* Initialize our instance variables.Aaron Patterson2011-11-161-1/+3
* Merge pull request #3649 from indirect/remote_ipAaron Patterson2011-11-162-5/+7
|\
| * the object itself isn't the IP, #to_s is the IPAndre Arko2011-11-161-1/+1
| * :facepalm: Request#remote_ip has to work without the middlewareAndre Arko2011-11-162-3/+3
| * Revert "Revert "Merge pull request #3640 from indirect/remote_ip""Andre Arko2011-11-162-6/+8
* | No need to `readlines` then `join`, just use `read` :heart:Aaron Patterson2011-11-161-1/+1
* | Adding a deprecation warning for use of the schema_info table.Aaron Patterson2011-11-161-0/+2
* | Join method uses empty string by default, so remove itAaron Patterson2011-11-161-2/+2
* | dbfile isn't supported anymore, so removeAaron Patterson2011-11-161-3/+3
* | Reduce schema format testsAaron Patterson2011-11-161-10/+14
* | Move conditionals to separate tasks so they can be reused.Aaron Patterson2011-11-161-7/+11
* | Merge pull request #3500 from olivierlacan/error-whitespaceJon Leighton2011-11-161-0/+1
|\ \
| * | CSS fix to prevent error output from being breaking out of body element.Olivier Lacan2011-11-031-0/+1
* | | Merge pull request #3438 from lazyatom/becomes-includes-errorsJon Leighton2011-11-162-0/+9
|\ \ \
| * | | `ActiveRecord::Base#becomes` should retain the errors of the original object.James Adam2011-11-162-0/+9
|/ / /
* | | Merge pull request #3608 from arunagw/unused_var_removeJon Leighton2011-11-162-2/+1
|\ \ \ | |_|/ |/| |
| * | Unused variable removedArun Agrawal2011-11-152-2/+1
* | | removing some useless conditionalsAaron Patterson2011-11-161-10/+8
* | | 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
|/ / /