aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #6357 from takai/improve_logging_of_mass_assignment_sanitizerAaron Patterson2012-05-164-15/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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.defineJohn Firebaugh2012-05-162-7/+17
* | | | | | | | | | 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_toJack Dempsey2012-05-161-0/+1
* | | | | | | | | | | Merge pull request #6192 from danmcclain/add_inet_and_cidr_types_to_postgresq...Aaron Patterson2012-05-165-15/+97
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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 Greenie0506/add_separator_to_grouped_options_fo...Aaron Patterson2012-05-162-4/+44
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add separator argument to grouped_options_for_selectGreenie05062012-05-152-4/+44
* | | | | | | | | | | | | Merge pull request #5535 from markmcspadden/issue_5527_rollbacksAaron Patterson2012-05-162-1/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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 Brian Cardarella2012-05-151-1/+1
* | | | | | | | | | | | | 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
* | | | | | | | | | | | | 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
* | | | | | | | | | | | | 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 requireSergey Nartimov2012-05-163-5/+1
* | | | | | | | | | | | | | fix bad formatting [ci skip]Vijay Dev2012-05-171-2/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #6136 from mhfs/sqlbypass_fixesAaron Patterson2012-05-162-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Rename test file so that the test suite matches it, implement `persisted?` fo...Marcelo Silveira2012-05-162-5/+15
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | 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 #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#%, 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 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 changelogAlexey Vakhov2012-05-161-1/+1
* | | | | | | | | | | | | Fix tests in railtiesPiotr Sarnacki2012-05-151-1/+1
* | | | | | | | | | | | | improve #6318Michal Papis2012-05-152-5/+11
* | | | | | | | | | | | | Merge pull request #6344 from erichmenge/patch_sqlite_time_typePiotr Sarnacki2012-05-154-4/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | SQLite3 doesn't actually support the 'time' type.Erich Menge2012-05-154-4/+16
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #6346 from oscardelben/patch-9Piotr Sarnacki2012-05-151-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove useless check of adapterOscar Del Ben2012-05-151-4/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #6343 from oscardelben/bump_sqlite3Rafael Mendonça França2012-05-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Bumo sqlite3 gemOscar Del Ben2012-05-151-1/+1
* | | | | | | | | | | | Merge pull request #6273 from KensoDev/feature/simple_format_refactoringRafael Mendonça França2012-05-152-9/+27
|\ \ \ \ \ \ \ \ \ \ \ \