aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6361 from markmcspadden/issue_6265José Valim2012-05-172-26/+2
|\ | | | | Remove special cases for duplicable? on Class and Module
| * Remove special cases for duplicable? on Class and ModuleMark McSpadden2012-05-172-26/+2
| |
* | Ensure blocks given to subscriber are properly yieldJosé Valim2012-05-172-5/+6
| |
* | Merge pull request #6356 from andhapp/fix-bug-with-inflectionsJosé Valim2012-05-162-1/+2
|\ \ | |/ |/| Fix an issue with inflection
| * Fix an issue with inflection where my_analyses (in plular form) incorrectly ↵Anuj Dutta2012-05-162-1/+2
| | | | | | | | converted to my_analyasis(in singular form).
* | Merge pull request #6360 from bcardarella/logger_debug_fixAaron Patterson2012-05-161-0/+3
|\ \ | | | | | | Fixed logger bug introduced by #2237
| * | Fixed logger bug introduced by #2237Brian Cardarella2012-05-171-0/+3
|/ /
* | Don't need to force size to nilRafael Mendonça França2012-05-164-10/+0
| |
* | Merge pull request #5453 from ↵Aaron Patterson2012-05-162-2/+12
|\ \ | | | | | | | | | | | | JonRowe/patch_uniq_has_and_belongs_to_many_when_already_loaded When Active Record has already loaded a unique association `.size` returns the wrong number.
| * | when using a preloaded array and the uniq flag is set then return the size ↵Jon Rowe2012-03-152-2/+12
| | | | | | | | | | | | of the uniq array
* | | Merge pull request #6357 from takai/improve_logging_of_mass_assignment_sanitizerAaron Patterson2012-05-164-15/+28
|\ \ \ | | | | | | | | Improve logging of ActiveModel::MassAssignmentSecurity::Sanitizer
| * | | Improve logging of ActiveModel::MassAssignmentSecurity::SanitizerNaoto Takai2012-05-174-15/+28
| | |/ | |/|
* | | Merge pull request #6358 from jfirebaugh/schema_defineAaron Patterson2012-05-162-7/+17
|\ \ \ | | | | | | | | Call methods on the correct instance in AR::Schema.define
| * | | Call methods on the correct instance in AR::Schema.defineJohn Firebaugh2012-05-162-7/+17
| | | | | | | | | | | | | | | | | | | | Now that migrations support instance methods, we should use the same instance rather than relying on delegation to a global instance. This allows subclassing AR::Schema.
* | | | Fix CollectionAssociation#replace to return new target (closes #6231)Piotr Sarnacki2012-05-162-0/+14
| | | |
* | | | Document the usage of grouped_options_for_select with divider optionRafael Mendonça França2012-05-161-1/+19
| | | |
* | | | Make :prompt work as documentedRafael Mendonça França2012-05-163-3/+16
| | | |
* | | | Test deprecation and fix the documentation of grouped_options_for_selectRafael Mendonça França2012-05-162-3/+6
| | | |
* | | | Merge pull request #2237 from jackdempsey/log_redirect_toAaron Patterson2012-05-161-0/+1
|\ \ \ \ | | | | | | | | | | log at debug level what line caused the redirect_to
| * | | | log at debug level what line caused the redirect_toJack Dempsey2012-05-161-0/+1
| | | | |
* | | | | Merge pull request #6192 from ↵Aaron Patterson2012-05-165-15/+97
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | danmcclain/add_inet_and_cidr_types_to_postgresql_adapter Add support for macaddr, inet, and cidr types to PostgreSQL adapter
| * | | | | Removes NetAddr dependencyDan McClain2012-05-083-10/+11
| | | | | |
| * | | | | Converts inet and cidr columns to NetAddr::CIDRDan Seaver2012-05-075-7/+48
| | | | | |
| * | | | | Adds migration and schema dump support for INET, CIDR, and MACADDRDan Seaver2012-05-053-7/+47
| | | | | |
* | | | | | Merge pull request #5369 from ↵Aaron Patterson2012-05-162-4/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Greenie0506/add_separator_to_grouped_options_for_select Add separator option to grouped_options_for_select
| * | | | | | Add separator argument to grouped_options_for_selectGreenie05062012-05-152-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change prompt to options hash in grouped_options_for_select
* | | | | | | Merge pull request #5535 from markmcspadden/issue_5527_rollbacksAaron Patterson2012-05-162-1/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow manual rollbacks in after_save to reset object correctly
| * | | | | | | Allow manual rollbacks in after_save to reset object correctlyMark McSpadden2012-03-212-1/+46
| | | | | | | |
* | | | | | | | Load all the env files available in config.paths (closes #6335)Piotr Sarnacki2012-05-163-3/+14
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #6337 from bcardarella/patch-1Aaron Patterson2012-05-161-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Changing the indentation level of the block comment close for Sass
| * | | | | | Changing the indentation level of the block comment close for SASS Brian Cardarella2012-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
* | | | | | | assuming there is only one column, we can simplify the type cast loopAaron Patterson2012-05-161-7/+6
| | | | | | |
* | | | | | | MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unlessAaron Patterson2012-05-162-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an alias is provided. Without the alias, the column cannot be found and properly typecast.
* | | | | | | remove stray text in getting started guide [ci skip]Vijay Dev2012-05-171-4/+4
| | | | | | |
* | | | | | | Revert "Merge pull request #6354 from lest/patch-1"Carlos Galdino + Rafael Mendonça França2012-05-163-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e8feaff60b9c04d34ad234f7d17b5d2ad9cc7a24, reversing changes made to 9adf28c026070afb78b80027521a4ddddd68d697. Reason: This broke the actionmailer tests
* | | | | | | document the AR::Base#ids method introduced in 9307616 [ci skip]Vijay Dev2012-05-171-0/+18
| | | | | | |
* | | | | | | Merge pull request #6354 from lest/patch-1Rafael Mendonça França2012-05-163-5/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove unnecessary require
| * | | | | | | remove unnecessary requireSergey Nartimov2012-05-163-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - access & filters don't use multibyte ext - transliterate requires only AS::Multibyte but not multibyte ext
* | | | | | | | fix bad formatting [ci skip]Vijay Dev2012-05-171-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #6136 from mhfs/sqlbypass_fixesAaron Patterson2012-05-162-5/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Bring SqlByPassTest to light and fix broken tests
| * | | | | | | Rename test file so that the test suite matches it, implement `persisted?` ↵Marcelo Silveira2012-05-162-5/+15
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | for SqlBypass as expected by tests and convert session_id to string before using on queries to get correct quotes on postgresql (avoid casting error).
* | | | | | | Merge pull request #6349 from erichmenge/patch-raise-type-errorsAaron Patterson2012-05-164-7/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Integer limit out of range should be allowed to raise. Closes #6272
| * | | | | | | Integer limit out of range should be allowed to raise. Closes #6272Erich Menge2012-05-164-7/+34
| |/ / / / / /
* | | | | | | Merge pull request #6353 from nashby/safe-interpolationAaron Patterson2012-05-162-0/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix safe string interpolation with SafeBuffer#%
| * | | | | | | fix safe string interpolation with SafeBuffer#%, closes #6352Vasiliy Ermolovich2012-05-162-0/+38
| | | | | | | |
* | | | | | | | Merge pull request #6336 from erichmenge/patch-pluck-fragmentCarlos Antonio da Silva2012-05-162-8/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fixes issue where SQL fragments prevented type casting based on column
| * | | | | | | Fixes issue where SQL fragments prevented type casting based on column type.Erich Menge2012-05-162-8/+6
| |/ / / / / /
* | | | | | | remove image_tag onmouseover option docs [ci skip]Vijay Dev2012-05-161-6/+0
| | | | | | |
* | | | | | | Remove unneeded testsPiotr Sarnacki2012-05-161-12/+0
| | | | | | |
* | | | | | | Merge pull request #6347 from avakhov/ar-changelog-misprintVijay Dev2012-05-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix misprint in AR changelog
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:24:21 +0000