Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge pull request #99 from GRoguelon/master | Vijay Dev | 2012-05-15 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Fix an error in example in methods of instanciated fixtures. | Geoffrey Roguelon | 2012-05-15 | 1 | -1/+1 | |
| * | | corrected some misspelling | Angelo capilleri | 2012-05-15 | 1 | -3/+3 | |
| * | | Fix typo [ci skip] | Peter Suschlik | 2012-05-15 | 1 | -1/+1 | |
* | | | Merge pull request #6362 from bogdan/callbacks_simplify_statement | José Valim | 2012-05-17 | 1 | -2/+2 | |
|\ \ \ | ||||||
| * | | | AS::Callbacks: simplify logical statement | Bogdan Gusiev | 2012-05-17 | 1 | -2/+2 | |
* | | | | Merge pull request #6361 from markmcspadden/issue_6265 | José Valim | 2012-05-17 | 2 | -26/+2 | |
|\ \ \ \ | ||||||
| * | | | | Remove special cases for duplicable? on Class and Module | Mark McSpadden | 2012-05-17 | 2 | -26/+2 | |
* | | | | | Ensure blocks given to subscriber are properly yield | José Valim | 2012-05-17 | 2 | -5/+6 | |
* | | | | | Merge pull request #6356 from andhapp/fix-bug-with-inflections | José Valim | 2012-05-16 | 2 | -1/+2 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix an issue with inflection where my_analyses (in plular form) incorrectly c... | Anuj Dutta | 2012-05-16 | 2 | -1/+2 | |
* | | | | | Merge pull request #6360 from bcardarella/logger_debug_fix | Aaron Patterson | 2012-05-16 | 1 | -0/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fixed logger bug introduced by #2237 | Brian Cardarella | 2012-05-17 | 1 | -0/+3 | |
|/ / / / / | ||||||
* | | | | | Don't need to force size to nil | Rafael Mendonça França | 2012-05-16 | 4 | -10/+0 | |
* | | | | | Merge pull request #5453 from JonRowe/patch_uniq_has_and_belongs_to_many_when... | Aaron Patterson | 2012-05-16 | 2 | -2/+12 | |
|\ \ \ \ \ | ||||||
| * | | | | | when using a preloaded array and the uniq flag is set then return the size of... | Jon Rowe | 2012-03-15 | 2 | -2/+12 | |
* | | | | | | Merge pull request #6357 from takai/improve_logging_of_mass_assignment_sanitizer | Aaron Patterson | 2012-05-16 | 4 | -15/+28 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Improve logging of ActiveModel::MassAssignmentSecurity::Sanitizer | Naoto Takai | 2012-05-17 | 4 | -15/+28 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #6358 from jfirebaugh/schema_define | Aaron Patterson | 2012-05-16 | 2 | -7/+17 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Call methods on the correct instance in AR::Schema.define | John Firebaugh | 2012-05-16 | 2 | -7/+17 | |
* | | | | | | | Fix CollectionAssociation#replace to return new target (closes #6231) | Piotr Sarnacki | 2012-05-16 | 2 | -0/+14 | |
* | | | | | | | Document the usage of grouped_options_for_select with divider option | Rafael Mendonça França | 2012-05-16 | 1 | -1/+19 | |
* | | | | | | | Make :prompt work as documented | Rafael Mendonça França | 2012-05-16 | 3 | -3/+16 | |
* | | | | | | | Test deprecation and fix the documentation of grouped_options_for_select | Rafael Mendonça França | 2012-05-16 | 2 | -3/+6 | |
* | | | | | | | Merge pull request #2237 from jackdempsey/log_redirect_to | Aaron Patterson | 2012-05-16 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | log at debug level what line caused the redirect_to | Jack Dempsey | 2012-05-16 | 1 | -0/+1 | |
* | | | | | | | | Merge pull request #6192 from danmcclain/add_inet_and_cidr_types_to_postgresq... | Aaron Patterson | 2012-05-16 | 5 | -15/+97 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Removes NetAddr dependency | Dan McClain | 2012-05-08 | 3 | -10/+11 | |
| * | | | | | | | | Converts inet and cidr columns to NetAddr::CIDR | Dan Seaver | 2012-05-07 | 5 | -7/+48 | |
| * | | | | | | | | Adds migration and schema dump support for INET, CIDR, and MACADDR | Dan Seaver | 2012-05-05 | 3 | -7/+47 | |
* | | | | | | | | | Merge pull request #5369 from Greenie0506/add_separator_to_grouped_options_fo... | Aaron Patterson | 2012-05-16 | 2 | -4/+44 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add separator argument to grouped_options_for_select | Greenie0506 | 2012-05-15 | 2 | -4/+44 | |
* | | | | | | | | | | Merge pull request #5535 from markmcspadden/issue_5527_rollbacks | Aaron Patterson | 2012-05-16 | 2 | -1/+46 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Allow manual rollbacks in after_save to reset object correctly | Mark McSpadden | 2012-03-21 | 2 | -1/+46 | |
* | | | | | | | | | | | Load all the env files available in config.paths (closes #6335) | Piotr Sarnacki | 2012-05-16 | 3 | -3/+14 | |
| |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #6337 from bcardarella/patch-1 | Aaron Patterson | 2012-05-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Changing the indentation level of the block comment close for SASS | Brian Cardarella | 2012-05-15 | 1 | -1/+1 | |
* | | | | | | | | | | assuming there is only one column, we can simplify the type cast loop | Aaron Patterson | 2012-05-16 | 1 | -7/+6 | |
* | | | | | | | | | | MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unless | Aaron Patterson | 2012-05-16 | 2 | -5/+16 | |
* | | | | | | | | | | remove stray text in getting started guide [ci skip] | Vijay Dev | 2012-05-17 | 1 | -4/+4 | |
* | | | | | | | | | | Revert "Merge pull request #6354 from lest/patch-1" | Carlos Galdino + Rafael Mendonça França | 2012-05-16 | 3 | -1/+5 | |
* | | | | | | | | | | document the AR::Base#ids method introduced in 9307616 [ci skip] | Vijay Dev | 2012-05-17 | 1 | -0/+18 | |
* | | | | | | | | | | Merge pull request #6354 from lest/patch-1 | Rafael Mendonça França | 2012-05-16 | 3 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | remove unnecessary require | Sergey Nartimov | 2012-05-16 | 3 | -5/+1 | |
* | | | | | | | | | | | fix bad formatting [ci skip] | Vijay Dev | 2012-05-17 | 1 | -2/+2 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #6136 from mhfs/sqlbypass_fixes | Aaron Patterson | 2012-05-16 | 2 | -5/+15 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Rename test file so that the test suite matches it, implement `persisted?` fo... | Marcelo Silveira | 2012-05-16 | 2 | -5/+15 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #6349 from erichmenge/patch-raise-type-errors | Aaron Patterson | 2012-05-16 | 4 | -7/+34 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Integer limit out of range should be allowed to raise. Closes #6272 | Erich Menge | 2012-05-16 | 4 | -7/+34 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #6353 from nashby/safe-interpolation | Aaron Patterson | 2012-05-16 | 2 | -0/+38 | |
|\ \ \ \ \ \ \ \ \ \ |