| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-tests | José Valim | 2011-05-28 | 2 | -0/+29 |
| |\ | | | | | Stringify param values in controller tests. | ||||
| | * | use to_param (and change method to name accordingly) | David Chelimsky | 2011-05-22 | 1 | -8/+8 |
| | | | | | | | | | | | - exclude Rack::Test::UploadedFile to pass existing tests. Are there any other types we're missing? | ||||
| | * | Stringify param values in controller tests. | David Chelimsky | 2011-05-22 | 2 | -0/+29 |
| | | | | | | | | | | | | | | | | | This reduces false positives that come from using ints in params in tests, which do not get converted to strings in the tests. In implementations going through rack, they do get converted to strings. - David Chelimsky and Sam Umbach | ||||
| * | | Merge pull request #1378 from AndrewRadev/master | José Valim | 2011-05-28 | 1 | -0/+3 |
| |\ \ | | | | | | | Add changelog entry for pull request #1359 | ||||
| | * | | ActiveSupport CHANGELOG entry moved to correct place | Andrew Radev | 2011-05-28 | 1 | -2/+2 |
| | | | | |||||
| | * | | Update CHANGELOG for ActiveSupport::OrderedHash change | Andrew Radev | 2011-05-28 | 1 | -0/+3 |
| | | | | |||||
| * | | | Merge pull request #1373 from anbotero/master | José Valim | 2011-05-28 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Minor typo corrected | ||||
| | * | | | Fix typo in test. | Andrés Botero | 2011-05-28 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #1372 from jacott/master | José Valim | 2011-05-27 | 3 | -11/+13 |
| |\ \ \ | | | | | | | | | Fix for relative_url_root when used with sprockets | ||||
| | * | | | fixed asset_paths when called from sprockets for relative_url_root | jacott | 2011-05-28 | 3 | -11/+13 |
| | | | | | |||||
| * | | | | Merge pull request #1371 from FLOChip/typo | Xavier Noria | 2011-05-27 | 1 | -9/+9 |
| |\ \ \ \ | |/ / / |/| | | | Typo in ActionMailer::Base | ||||
| | * | | | minor typo in the rdoc about Interceptor. | Teng Siong Ong | 2011-05-28 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | minor spacing fix in code example in ActionMailer::Base. | Teng Siong Ong | 2011-05-28 | 1 | -8/+8 |
| |/ / / | |||||
| * | | | Merge pull request #1368 from amatsuda/disable_im_by_default_on_test | Aaron Patterson | 2011-05-27 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | Disable IdentityMap by default for ActiveRecord testing | ||||
| | * | | | Disable IdentityMap by default for ActiveRecord testing | Akira Matsuda | 2011-05-28 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | because enabling IM by default will possibly hide some bugs on 3.1 default behavior | ||||
| * | | | stop using boolean expressions because of the side effects | Aaron Patterson | 2011-05-27 | 1 | -1/+4 |
| | | | | |||||
| * | | | Merge pull request #1365 from gnufied/sqlite3 | Aaron Patterson | 2011-05-27 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | close statment only if its not closed | ||||
| | * | | | delegate connection and column_hash calls directly to model | Hemant Kumar | 2011-05-28 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | close statment only if its not closed | Hemant Kumar | 2011-05-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1229 from workmad3/master | Aaron Patterson | 2011-05-27 | 2 | -2/+16 |
| |\ \ \ \ | |/ / / |/| | | | Fix for Issue #1205 | ||||
| | * | | | Added a test to check for correct behaviour with no options in add_index ↵ | David Workman | 2011-05-24 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | command recorder | ||||
| | * | | | Using .try to test for the existence of a method option in a nil-resistent ↵ | David Workman | 2011-05-23 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat | ||||
| | * | | | Neatened up the invert_add_index method as per suggeston | David Workman | 2011-05-23 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | Simple fix for correctly inverting an add_index migration when a name has ↵ | David Workman | 2011-05-23 | 2 | -2/+12 |
| | | | | | | | | | | | | | | | | | been provided | ||||
| * | | | | work around bug in the sqlite3 bindings. fixes #1289 | Aaron Patterson | 2011-05-27 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1346 from arunagw/jdom_file_from_xml_fix | Aaron Patterson | 2011-05-27 | 2 | -15/+22 |
| |\ \ \ \ | | | | | | | | | | | Jdom file from xml fix | ||||
| | * | | | | Adding tests for file_from_xml for XmlMini_JDOM #jruby | Arun Agrawal | 2011-05-27 | 1 | -14/+14 |
| | | | | | | |||||
| | * | | | | Adding __content__ into XmlMini_JDOM | Arun Agrawal | 2011-05-27 | 1 | -1/+8 |
| | | | | | | |||||
| * | | | | | fixing test for mysql2 | Aaron Patterson | 2011-05-27 | 1 | -5/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #1359 from AndrewRadev/master | José Valim | 2011-05-27 | 2 | -1/+28 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | Fix for ruby 1.8 bug with ActiveSupport::OrderedHash | ||||
| | * | | | | Fixes minor ruby 1.8 inconsistency | Andrew Radev | 2011-05-27 | 2 | -1/+28 |
| |/ / / / | | | | | | | | | | | | | | | | | ActiveSupport::OrderedHash did not behave identically to Hash when given a block with a splat. | ||||
| * | | | | adding a test for #1322 | Aaron Patterson | 2011-05-26 | 1 | -0/+15 |
| | | | | | |||||
| * | | | | Merge pull request #1323 from fx/association_primary_key | Jon Leighton | 2011-05-26 | 2 | -1/+11 |
| |\ \ \ \ | | | | | | | | | | | use association_primary_key in AssociationScope#add_constraints | ||||
| | * | | | | added assertion for non-standard primary_key on models used in the ↵ | Marian Rudzynski | 2011-05-26 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | primary_key test | ||||
| | * | | | | use association_primary_key in AssociationScope#add_constraints | Marian Rudzynski | 2011-05-26 | 2 | -1/+8 |
| | | | | | | |||||
| * | | | | | Merge pull request #1318 from TheEmpty/master | Jon Leighton | 2011-05-26 | 3 | -19/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | Resolve issue #534 | ||||
| | * | | | | | Removes a now needless test - via Github | Mohammad Typaldos | 2011-05-26 | 1 | -8/+0 |
| | | | | | | | |||||
| | * | | | | | Removes the restriction on primary key when joining in a habtm && test that ↵ | Mohammad El-Abid | 2011-05-26 | 3 | -15/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | it was properly removed | ||||
| * | | | | | | Merge pull request #1334 from bogdan/callback | José Valim | 2011-05-26 | 7 | -39/+57 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | MassAssignmentSecurity: add ability to specify your own sanitizer | ||||
| | * | | | | | MassAssignmentSecurity: add ability to specify your own sanitizer | Bogdan Gusiev | 2011-05-26 | 7 | -39/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an ability to specify your own behavior on mass assingment protection, controlled by option: ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer | ||||
| * | | | | | | Merge pull request #1344 from jmileham/serialization_includes | José Valim | 2011-05-26 | 2 | -6/+11 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | AR Serialization shouldn't fall back to base opts for includes | ||||
| | * | | | | | | Don't merge base opts into includes when serializing ARs | John Mileham | 2011-05-26 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/serialization.rb | ||||
| | * | | | | | | Failing test - JSON serialization shouldn't merge base opts into include opts. | John Mileham | 2011-05-26 | 1 | -0/+9 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #1328 from flippingbits/cleanup_engine_generator | José Valim | 2011-05-26 | 3 | -3/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Cleanup engine generator | ||||
| | * | | | | | | Use global namespace Rails | Stefan Sprenger | 2011-05-26 | 2 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Use plugin name consistently | Stefan Sprenger | 2011-05-26 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #1324 from dmathieu/no_error_on_invalid_format | José Valim | 2011-05-26 | 2 | -1/+7 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Don't raise an exception if the format isn't recognized | ||||
| | * | | | | | don't raise an exception if the format isn't recognized | dmathieu | 2011-05-26 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixed while traveling to heuruko | ||||
| * | | | | | | Merge pull request #1315 from ardavis/master | José Valim | 2011-05-25 | 2 | -2/+2 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Removed unnecessary space in application.rb | ||||
| | * | | | | | Added a space to the comment_if helper for formatting purposes | Andrew Davis | 2011-05-25 | 1 | -1/+1 |
| | | | | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |