aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1371 from FLOChip/typoXavier Noria2011-05-271-9/+9
|\ | | | | Typo in ActionMailer::Base
| * minor typo in the rdoc about Interceptor.Teng Siong Ong2011-05-281-1/+1
| |
| * minor spacing fix in code example in ActionMailer::Base.Teng Siong Ong2011-05-281-8/+8
|/
* Merge pull request #1368 from amatsuda/disable_im_by_default_on_testAaron Patterson2011-05-271-2/+2
|\ | | | | Disable IdentityMap by default for ActiveRecord testing
| * Disable IdentityMap by default for ActiveRecord testingAkira Matsuda2011-05-281-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 effectsAaron Patterson2011-05-271-1/+4
|
* Merge pull request #1365 from gnufied/sqlite3Aaron Patterson2011-05-272-2/+2
|\ | | | | close statment only if its not closed
| * delegate connection and column_hash calls directly to modelHemant Kumar2011-05-281-1/+1
| |
| * close statment only if its not closedHemant Kumar2011-05-281-1/+1
| |
* | Merge pull request #1229 from workmad3/masterAaron Patterson2011-05-272-2/+16
|\ \ | |/ |/| Fix for Issue #1205
| * Added a test to check for correct behaviour with no options in add_index ↵David Workman2011-05-241-0/+6
| | | | | | | | command recorder
| * Using .try to test for the existence of a method option in a nil-resistent ↵David Workman2011-05-231-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 suggestonDavid Workman2011-05-231-2/+3
| |
| * Simple fix for correctly inverting an add_index migration when a name has ↵David Workman2011-05-232-2/+12
| | | | | | | | been provided
* | work around bug in the sqlite3 bindings. fixes #1289Aaron Patterson2011-05-271-0/+1
| |
* | Merge pull request #1346 from arunagw/jdom_file_from_xml_fixAaron Patterson2011-05-272-15/+22
|\ \ | | | | | | Jdom file from xml fix
| * | Adding tests for file_from_xml for XmlMini_JDOM #jrubyArun Agrawal2011-05-271-14/+14
| | |
| * | Adding __content__ into XmlMini_JDOMArun Agrawal2011-05-271-1/+8
| | |
* | | fixing test for mysql2Aaron Patterson2011-05-271-5/+2
| | |
* | | Merge pull request #1359 from AndrewRadev/masterJosé Valim2011-05-272-1/+28
|\ \ \ | | | | | | | | Fix for ruby 1.8 bug with ActiveSupport::OrderedHash
| * | | Fixes minor ruby 1.8 inconsistencyAndrew Radev2011-05-272-1/+28
|/ / / | | | | | | | | | | | | ActiveSupport::OrderedHash did not behave identically to Hash when given a block with a splat.
* | | adding a test for #1322Aaron Patterson2011-05-261-0/+15
| | |
* | | Merge pull request #1323 from fx/association_primary_keyJon Leighton2011-05-262-1/+11
|\ \ \ | | | | | | | | use association_primary_key in AssociationScope#add_constraints
| * | | added assertion for non-standard primary_key on models used in the ↵Marian Rudzynski2011-05-261-0/+3
| | | | | | | | | | | | | | | | primary_key test
| * | | use association_primary_key in AssociationScope#add_constraintsMarian Rudzynski2011-05-262-1/+8
| | | |
* | | | Merge pull request #1318 from TheEmpty/masterJon Leighton2011-05-263-19/+0
|\ \ \ \ | | | | | | | | | | Resolve issue #534
| * | | | Removes a now needless test - via GithubMohammad Typaldos2011-05-261-8/+0
| | | | |
| * | | | Removes the restriction on primary key when joining in a habtm && test that ↵Mohammad El-Abid2011-05-263-15/+4
| | | | | | | | | | | | | | | | | | | | it was properly removed
* | | | | Merge pull request #1334 from bogdan/callbackJosé Valim2011-05-267-39/+57
|\ \ \ \ \ | |_|_|/ / |/| | | | MassAssignmentSecurity: add ability to specify your own sanitizer
| * | | | MassAssignmentSecurity: add ability to specify your own sanitizerBogdan Gusiev2011-05-267-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_includesJosé Valim2011-05-262-6/+11
|\ \ \ \ \ | | | | | | | | | | | | AR Serialization shouldn't fall back to base opts for includes
| * | | | | Don't merge base opts into includes when serializing ARsJohn Mileham2011-05-261-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/serialization.rb
| * | | | | Failing test - JSON serialization shouldn't merge base opts into include opts.John Mileham2011-05-261-0/+9
|/ / / / /
* | | | | Merge pull request #1328 from flippingbits/cleanup_engine_generatorJosé Valim2011-05-263-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Cleanup engine generator
| * | | | | Use global namespace RailsStefan Sprenger2011-05-262-2/+2
| | | | | |
| * | | | | Use plugin name consistentlyStefan Sprenger2011-05-261-1/+1
|/ / / / /
* | | | | Merge pull request #1324 from dmathieu/no_error_on_invalid_formatJosé Valim2011-05-262-1/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | Don't raise an exception if the format isn't recognized
| * | | | don't raise an exception if the format isn't recognizeddmathieu2011-05-262-1/+7
| | | | | | | | | | | | | | | | | | | | Fixed while traveling to heuruko
* | | | | Merge pull request #1315 from ardavis/masterJosé Valim2011-05-252-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | Removed unnecessary space in application.rb
| * | | | Added a space to the comment_if helper for formatting purposesAndrew Davis2011-05-251-1/+1
| | | | |
| * | | | Accidentally added extra IDE files, removed them.Andrew Davis2011-05-258-342/+0
| | | | |
| * | | | Removed unnecessary space in application.rb for formattingAndrew Davis2011-05-259-1/+343
| | | | |
* | | | | Merge pull request #1316 from guilleiguaran/railties-changelogAaron Patterson2011-05-251-0/+7
|\ \ \ \ \ | |/ / / / |/| | | | Updating Railties changelog
| * | | | Updating Railties changelogGuillermo Iguaran2011-05-251-0/+7
|/ / / /
* | | | Merge pull request #1312 from joshk/remove_active_support_deprecationsJosé Valim2011-05-2515-648/+3
|\ \ \ \ | | | | | | | | | | Removed deprecated methods and related tests from ActiveSupport
| * | | | Removed deprecated methods and related tests from ActiveSupportJosh Kalderimis2011-05-2515-648/+3
|/ / / /
* | | | Merge pull request #1311 from kuldarkrabbi/masterJosé Valim2011-05-251-1/+0
|\ \ \ \ | | | | | | | | | | action_view/template/handler.rb has been removed
| * | | | action_view/template/handler has been removedKuldar Krabbi2011-05-251-1/+0
| | | | |
* | | | | Merge branch 'master' of github.com:rails/railsXavier Noria2011-05-2512-162/+4
|\| | | |
| * | | | Merge pull request #1285 from joshk/remove_active_record_deprecationsAaron Patterson2011-05-2512-162/+4
| |\ \ \ \ | | | | | | | | | | | | removed deprecated methods, and related tests, from ActiveRecord
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:37:38 +0000