aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5860 from arunagw/multi_json_upgrade_fixPiotr Sarnacki2012-04-162-4/+4
|\ | | | | fixed broken build after multi_json upgrade
| * fixed broken build after multi_json upgradeArun Agrawal2012-04-162-4/+4
|/ | | Multi_json also upgraded.
* Merge pull request #5856 from arunagw/build_fix_masterPiotr Sarnacki2012-04-162-8/+6
|\ | | | | fix scaffold_generator_test.rb
| * fix scaffold_generator_test.rb and model_generator_test.rbArun Agrawal2012-04-162-8/+6
| | | | | | | | Broken after this 6a054b0038bac288a1f6e45feb5470f4ee492081
* | Merge pull request #5858 from bsodmike/masterVijay Dev2012-04-163-3/+3
|\ \ | |/ |/| Update Rails 3.2.3 release date in changelogs as March 30, 2012
| * Update Rails 3.2.3 release date in changelogs as March 30, 2012Michael de Silva2012-04-163-3/+3
|/ | | | | The release date details have been taken from http://weblog.rubyonrails.org/2012/3/30/ann-rails-3-2-3-has-been-released/
* opening a connection will block if the pool is fullAaron Patterson2012-04-152-20/+63
|
* Require for time_with_zone should stay in core_ext/time_zones :bomb:Piotr Sarnacki2012-04-151-0/+1
|
* Add missing require in Active Support time zones (fixes #5854)Piotr Sarnacki2012-04-151-1/+1
| | | | | I also removed the other require as it's already present in `activesupport/core_ext/time/calculations`
* Merge pull request #5262 from joshuap/references_indexJeremy Kemper2012-04-148-6/+159
|\ | | | | Automatically create indexes for references/belongs_to statements in migrations.
| * Automatically create indexes for references/belongs_to statements in migrations.Joshua Wood2012-04-148-6/+159
|/
* Merge pull request #5846 from nashby/patch-1José Valim2012-04-141-1/+1
|\ | | | | remove extra new line from generated Gemfile
| * remove extra new line from generated GemfileVasiliy Ermolovich2012-04-141-1/+1
|/
* Merge pull request #5842 from oscardelben/refactoring_notify_observersSantiago Pastorino2012-04-141-2/+2
|\ | | | | Rename notify_observers argument *arg to *args to make it more clear
| * Rename notify_observers argument *arg to *args to make it more clearOscar Del Ben2012-04-141-2/+2
| | | | | | | | that the method accepts multiple arguments
* | Merge pull request #5837 from yahonda/new_sequence_name_is_too_longJon Leighton2012-04-141-4/+4
|\ \ | | | | | | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix
| * | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffixYasuo Honda2012-04-131-4/+4
| | |
* | | extract deprecated code for #find, #first, #last, #allJon Leighton2012-04-131-105/+36
| | |
* | | extract deprecated #calculate codeJon Leighton2012-04-131-83/+25
| | |
* | | move code out to active_record_deprecated_findersJon Leighton2012-04-131-7/+2
| | |
* | | fix testsJon Leighton2012-04-137-81/+74
| | |
* | | Merge pull request #5832 from kennyj/fix_5267Jon Leighton2012-04-132-3/+7
|\ \ \ | | | | | | | | Fix a wrong return value from reset_sequence_name method.
| * | | Fix wrong return value from reset_sequence_name method.kennyj2012-04-142-3/+7
| | | |
* | | | move some of the update_all implementation to active_record_deprecated_findersJon Leighton2012-04-131-27/+14
| | | |
* | | | Merge pull request #5814 from lest/patch-4Piotr Sarnacki2012-04-131-12/+13
|\ \ \ \ | |_|_|/ |/| | | don't duplicate default values in text helper
| * | | don't duplicate default values in text helperSergey Nartimov2012-04-111-12/+13
| | | |
* | | | now we can just manipulate the values hash in #only and #exceptJon Leighton2012-04-134-36/+26
| | | |
* | | | use a hash to store relation valuesJon Leighton2012-04-135-52/+74
| |/ / |/| |
* | | Merge pull request #5823 from avakhov/ac-test-case-remove-obsolete-codeJon Leighton2012-04-131-3/+0
|\ \ \ | | | | | | | | Remove obsolete code
| * | | Remove obsolete codeAlexey Vakhov2012-04-121-3/+0
| | | |
* | | | doesn't make sense for select! to take a blockJon Leighton2012-04-131-8/+3
| | | |
* | | | remove apply_finder_options call from AssociationScopeJon Leighton2012-04-134-9/+15
| | | |
* | | | Make Relation#extending work like other value methodsJon Leighton2012-04-135-27/+22
| | | |
* | | | Add Relation#merge!Jon Leighton2012-04-132-9/+17
| | | |
* | | | assert valid keysJon Leighton2012-04-133-0/+11
| | | |
* | | | Allow Relation#merge to take a hashJon Leighton2012-04-134-49/+95
| | | |
* | | | we have no need for the ASSOCIATION_METHODS constantJon Leighton2012-04-134-15/+11
| | | |
* | | | we don't need to test that constant assignment worksJon Leighton2012-04-131-15/+0
| | | |
* | | | refactoringJon Leighton2012-04-131-36/+45
| | | |
* | | | Extract clusterfuck method for surgeryJon Leighton2012-04-132-71/+92
| |_|/ |/| |
* | | Merge pull request #5830 from raganwald/masterXavier Noria2012-04-121-1/+3
|\ \ \ | |/ / |/| | Update RDoc to mention integer coercion in ActiveRecord’s find by id
| * | mention that coercion only happens when the primary key is an integer and ↵Reg Braithwaite2012-04-121-2/+2
| | | | | | | | | | | | use +to_i+ formatting
| * | Documents that ActiveRecord's find by id uses to_i to coerce its arguments ↵Reg Braithwaite2012-04-121-1/+3
|/ / | | | | | | to integers
* | Add bang versions of relation query methods.Jon Leighton2012-04-123-84/+194
| | | | | | | | | | The main reason for this is that I want to separate the code that does the mutating from the code that does the cloning.
* | #send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so ↵Jeremy Kemper2012-04-121-1/+21
| | | | | | | | opening the file to set the response body is wasteful. Set a FileBody wrapper instead that responds to to_path and streams the file if needed.
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-126-8/+11
|\ \
| * | Fixed markup in security guideAlfonso Cora2012-04-121-1/+1
| | |
| * | Grammar fix in 3.2 Release Notes guide Tim Harvey2012-04-111-1/+1
| | | | | | | | | | | | Could also be worded 'as an option', but plural made more sense given the mention of ':handlers and :formats'.
| * | copy editing [ci skip]Vijay Dev2012-04-111-3/+2
| | |
| * | Revert "add instructions for adding additional manifests"Vijay Dev2012-04-111-5/+1
| | | | | | | | | | | | | | | | | | This reverts commit f28f1d70b3f3dd9f694067f7cab2e717e302ee2b. Reason: This is already covered in this guide elsewhere.
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 11:48:22 +0000