| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Only used detailed schema introspection when doing a schema dump. | Christos Zisopoulos | 2011-11-18 | 2 | -1/+10 |
| | | | | Fixes #3678 | ||||
| * | Merge pull request #3680 from rubys/master | Jon Leighton | 2011-11-18 | 1 | -2/+2 |
| |\ | | | | | This fix causes the AWDwR test to go back to being green on Rails master. | ||||
| | * | Stop db:seed from performing a reload of the db | Sam Ruby | 2011-11-18 | 1 | -2/+2 |
| |/ | | | | Fix regression introduced by 38d26b0cb56d82093889efa95992a35ba3bb9f29 | ||||
| * | Merge pull request #3666 from oscardelben/databases_rake_cleanup | Vijay Dev | 2011-11-18 | 1 | -8/+9 |
| |\ | | | | | Cleanup of databases.rake psql env variables | ||||
| | * | Cleanup of databases.rake psql env variables | Oscar Del Ben | 2011-11-17 | 1 | -8/+9 |
| | | | |||||
| * | | release instructions: new section about docs generation | Xavier Noria | 2011-11-18 | 1 | -0/+31 |
| | | | |||||
| * | | Merge pull request #3669 from parndt/patch-1 | Vijay Dev | 2011-11-17 | 1 | -1/+1 |
| |\ \ | | | | | | | Fixed typo: expect -> expected | ||||
| | * | | Fixed typo: expect -> expected | Philip Arndt | 2011-11-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | _html translation should escape interpolated arguments | lest | 2011-11-17 | 3 | -4/+29 |
| | | | | |||||
| * | | | Revert "warn the user values are directly interpolated into _html ↵ | Xavier Noria | 2011-11-17 | 2 | -14/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translation strings" Reason: After another round of discussion, it has been decided to let interpolation deal with unsafe strings as it should do. This reverts commit d57d8098fc269a26ea0051a9027a33af1a9a4b2b. | ||||
| * | | | allow people to set a local .Gemfile so that things like ruby-debug are not ↵ | Aaron Patterson | 2011-11-17 | 2 | -5/+3 |
| | | | | | | | | | | | | | required for regular development | ||||
| * | | | warn the user values are directly interpolated into _html translation strings | Xavier Noria | 2011-11-17 | 2 | -0/+14 |
| |/ / | |||||
| * | | update guide: db:structure:dump produces structure.sql now | Vijay Dev | 2011-11-18 | 1 | -1/+1 |
| | | | |||||
| * | | Revert "Merge pull request #1163 from amatsuda/sexier_migration_31" | Aaron Patterson | 2011-11-17 | 4 | -142/+13 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 0e407a90413d8a19002b85508d811ccdf2190783, reversing changes made to 533a9f84b035756eedf9fdccf0c494dc9701ba72. Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/migration_test.rb | ||||
| * | | Revert "Merge pull request #3603 from vijaydev/change_table_without_block_arg" | Aaron Patterson | 2011-11-17 | 2 | -66/+7 |
| |/ | | | | | | | | | This reverts commit 81fad6a270ec3cbbb88553c9f2e8200c34fd4d13, reversing changes made to 23101de283de13517e30c4c3d1ecc65525264886. Conflicts: activerecord/test/cases/migration_test.rb | ||||
| * | Merge pull request #3663 from atambo/master | José Valim | 2011-11-17 | 4 | -10/+10 |
| |\ | | | | | Move schema_format :sql config setting from test.rb to application.rb | ||||
| | * | Move schema_format :sql config setting from test.rb to application.rb | Alex Tambellini | 2011-11-17 | 4 | -10/+10 |
| |/ | | | | | | I've moved the schema_format :sql config setting to application.rb because you would never enable this only for the test environment. If you use database constraints or database specific data types you would want all of your environments to use them. | ||||
| * | Merge pull request #3654 from wildchild/label_i18n | José Valim | 2011-11-17 | 2 | -1/+55 |
| |\ | | | | | Fix impractical I18n lookup in nested fields_for | ||||
| | * | Fix impractical I18n lookup in nested fields_for | Alexander Uvarov | 2011-11-17 | 2 | -1/+55 |
| | | | |||||
| * | | Merge pull request #3658 from arunagw/fix_initialize_var_name | Vijay Dev | 2011-11-16 | 1 | -1/+1 |
| |\ \ | | | | | | | It should be @calculated_ip not @calculate_ip | ||||
| | * | | It should be @calculated_ip not @calculate_ip | Arun Agrawal | 2011-11-17 | 1 | -1/+1 |
| |/ / | | | | | | | We are using @calculated_ip. @calculate_ip is no where used | ||||
| * | | Merge pull request #3656 from arunagw/readline_to_read | Vijay Dev | 2011-11-16 | 1 | -1/+1 |
| |\ \ | |/ |/| | No need to `readlines` then `join`, just use `read` :heart: | ||||
| | * | No need to `readlines` then `join`, just use `read` :heart: | Arun Agrawal | 2011-11-17 | 1 | -1/+1 |
| |/ | | | same as 4c1a1933cbc5ab96efe340a3b31ac5fee12c99c8 | ||||
| * | Initialize our instance variables. | Aaron Patterson | 2011-11-16 | 1 | -1/+3 |
| | | |||||
| * | Merge pull request #3649 from indirect/remote_ip | Aaron Patterson | 2011-11-16 | 2 | -5/+7 |
| |\ | | | | | Fixes for Request#remote_ip (no middleware, all proxies) | ||||
| | * | the object itself isn't the IP, #to_s is the IP | Andre Arko | 2011-11-16 | 1 | -1/+1 |
| | | | |||||
| | * | :facepalm: Request#remote_ip has to work without the middleware | Andre Arko | 2011-11-16 | 2 | -3/+3 |
| | | | |||||
| | * | Revert "Revert "Merge pull request #3640 from indirect/remote_ip"" | Andre Arko | 2011-11-16 | 2 | -6/+8 |
| | | | | | | | | | This reverts commit 8d1a2b3ecde5a8745b3eaab4763a71d80ca3441f, because I have fixed the issues this commit caused in the next commit. | ||||
| * | | No need to `readlines` then `join`, just use `read` :heart: | Aaron Patterson | 2011-11-16 | 1 | -1/+1 |
| | | | |||||
| * | | Adding a deprecation warning for use of the schema_info table. | Aaron Patterson | 2011-11-16 | 1 | -0/+2 |
| | | | |||||
| * | | Join method uses empty string by default, so remove it | Aaron Patterson | 2011-11-16 | 1 | -2/+2 |
| | | | |||||
| * | | dbfile isn't supported anymore, so remove | Aaron Patterson | 2011-11-16 | 1 | -3/+3 |
| | | | |||||
| * | | Reduce schema format tests | Aaron Patterson | 2011-11-16 | 1 | -10/+14 |
| | | | |||||
| * | | Move conditionals to separate tasks so they can be reused. | Aaron Patterson | 2011-11-16 | 1 | -7/+11 |
| | | | |||||
| * | | Merge pull request #3500 from olivierlacan/error-whitespace | Jon Leighton | 2011-11-16 | 1 | -0/+1 |
| |\ \ | | | | | | | CSS fix to prevent error output from being breaking out of body element. | ||||
| | * | | CSS fix to prevent error output from being breaking out of body element. | Olivier Lacan | 2011-11-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the white-space: pre-wrap adds extra line breaks to prevent the text from breaking out of the element's box. In this case single line output can be extremely long, breaking out the <body> element. See for reference: http://www.quirksmode.org/css/whitespace.html Before: http://link.olivierlacan.com/BVU4 After: http://link.olivierlacan.com/BUfM | ||||
| * | | | Merge pull request #3438 from lazyatom/becomes-includes-errors | Jon Leighton | 2011-11-16 | 2 | -0/+9 |
| |\ \ \ | | | | | | | | | Becomes includes errors | ||||
| | * | | | `ActiveRecord::Base#becomes` should retain the errors of the original object. | James Adam | 2011-11-16 | 2 | -0/+9 |
| |/ / / | | | | | | | | | | This commit contains a simple failing test that demonstrates the behaviour we expect, and a fix. When using `becomes` to transform the type of an object, it should retain any error information that was present on the original instance. | ||||
| * | | | Merge pull request #3608 from arunagw/unused_var_remove | Jon Leighton | 2011-11-16 | 2 | -2/+1 |
| |\ \ \ | |_|/ |/| | | Unused variable removed | ||||
| | * | | Unused variable removed | Arun Agrawal | 2011-11-15 | 2 | -2/+1 |
| | | | | |||||
| * | | | removing some useless conditionals | Aaron Patterson | 2011-11-16 | 1 | -10/+8 |
| | | | | |||||
| * | | | Merge pull request #2948 from atambo/master | Aaron Patterson | 2011-11-16 | 1 | -38/+66 |
| |\ \ \ | | | | | | | | | schema_format :sql should behave like schema_format :ruby | ||||
| | * | | | schema_format :sql should behave like schema_format :ruby | Alex Tambellini | 2011-11-04 | 1 | -38/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a db:structure:load task that is run instead of db:schema:load when schema_format is set to :sql. This patch also removes the prefixing of the structure.sql files to mimic the use of a single schema.rb file. The patch originates from github issue #715. | ||||
| * | | | | Switch from marshal format to plain text for the encoding conversions dump. ↵ | Jon Leighton | 2011-11-16 | 3 | -6/+95 |
| | | | | | | | | | | | | | | | | | This is for windows compatibility. Fixes #3644. | ||||
| * | | | | fixing tests on PG | Aaron Patterson | 2011-11-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | bundler treats trunk ruby as ruby 1.9, hack around that for now | Aaron Patterson | 2011-11-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Substituted RailsCommands for Rails::Commands | Daniel Dyba | 2011-11-16 | 1 | -159/+161 |
| | | | | | |||||
| * | | | | Changed Commands module to RailsCommands. | Daniel Dyba | 2011-11-16 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is to avoid a conflict that occurs when you add Rake to your Gemfile. There is a Commands Object in Rake that conflicts with the Commands module in plugin.rb. See rails issue #1866. | ||||
| * | | | | Merge pull request #3634 from RyanNaughton/fixes_3483 | Aaron Patterson | 2011-11-16 | 2 | -6/+12 |
| |\ \ \ \ | | | | | | | | | | | Fixes 3483 | ||||
| | * | | | | Fixes issue #3483, regarding using a mixture of ranges and discrete values ↵ | Ryan Naughton | 2011-11-14 | 2 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | | in find conditions. Paired with Joey Schoblaska. | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |