aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* stop test resetting global stateJon Leighton2011-12-231-0/+6
|
* Fix situation where id method didn't get defined causing postgres to failJon Leighton2011-12-231-4/+3
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-245-22/+27
|\ | | | | | | | | Conflicts: railties/guides/source/active_support_core_extensions.textile
| * AM::MAS.attr_protected: rework usage example.Bogdan Gusiev2011-12-231-9/+9
| |
| * Added link in MIT license for Action Mailer README. I think this seems ↵Kristian Freeman2011-12-221-1/+3
| | | | | | | | appropriate but commentary on this is not a bad idea.
| * Added link to MIT license. Would love commentary on whether this seems ↵Kristian Freeman2011-12-221-1/+3
| | | | | | | | appropriate.
| * Readability in Action Mailer README.Kristian Freeman2011-12-221-3/+3
| |
| * Correct grammar on Mailer generator -- passES. Working on enhancing ↵Kristian Freeman2011-12-221-1/+1
| | | | | | | | conventional readability in README and USAGE files.
| * [docs] pluck docs reverted for activesupportArun Agrawal2011-12-231-10/+0
| | | | | | https://github.com/rails/rails/commit/367741ef22d1538b8550cf6e4b2276a0946066c0
| * Fixed AM::MasAsSec.attr_protected usage example. Bogdan Gusiev2011-12-221-15/+16
| | | | | | | | | | | | | | | | Problems with current example: * DOESN'T WORK ** attr_protected :last_login, :as => :admin # doesn't make it accessible for admin * Uses ActiveSupport Fixnum extension
| * Fix AM::MassAssignementSecurity docBogdan Gusiev2011-12-221-1/+1
| |
| * [docs] Added missing "}" fixes #4126Arun Agrawal2011-12-221-1/+1
| |
* | Rails 3.2 Release NotesVijay Dev2011-12-241-0/+429
| |
* | Doh, remove debugging lineJon Leighton2011-12-231-1/+0
| |
* | Fix #4046.Jon Leighton2011-12-235-46/+58
| |
* | serialize fails on subclassAlvaro Bautista2011-12-234-6/+32
| |
* | removes Enumerable#pluck from the AS guideXavier Noria2011-12-231-10/+0
| |
* | Merge pull request #4140 from kuroda/databases_rakeAaron Patterson2011-12-221-0/+1
|\ \ | | | | | | Reconnect to the first database after db:create
| * | Reconnect to the first database after db:createTsutomu Kuroda2011-12-231-0/+1
| | | | | | | | | | | | | | | Otherwise, the schema and seed will be loaded onto the test database.
* | | Merge pull request #4142 from lest/remove-1-8-codeJosé Valim2011-12-221-21/+0
|\ \ \ | |/ / |/| | remove Enumerable#each_with_object again
| * | remove Enumerable#each_with_object againSergey Nartimov2011-12-231-21/+0
|/ / | | | | | | it come back occasionally in 367741ef
* | adding an integration test for splat regexp substitutions. fixes #4138Aaron Patterson2011-12-221-0/+13
| |
* | Adding an integration test. Fixes #4136Aaron Patterson2011-12-221-0/+9
| |
* | Fix build when IM=trueJon Leighton2011-12-221-4/+3
| |
* | Delete unnecessary line that was necessary before I changed the code and it ↵Jon Leighton2011-12-221-1/+0
| | | | | | | | became no longer necessary.
* | adds deprecation warnings to the RDoc of Array#uniq_by(!)Xavier Noria2011-12-201-2/+6
| |
* | removes some unnecessary selfsXavier Noria2011-12-201-3/+3
| |
* | rack bodies should be a listAaron Patterson2011-12-221-7/+7
| |
* | refactoring routing testsAaron Patterson2011-12-221-34/+19
| |
* | Remove 1.8 backportJon Leighton2011-12-221-9/+0
| |
* | remove conflict markerVijay Dev2011-12-231-1/+0
| |
* | Make ActiveRecord::Relation#pluck work with serialized attributesJon Leighton2011-12-222-5/+12
| |
* | Make read_attribute code path accessible at the class levelJon Leighton2011-12-225-56/+48
| |
* | Revert "Added Enumerable#pluck to wrap the common pattern of ↵Aaron Patterson2011-12-223-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | collect(&:method) *DHH*" This reverts commit 4d20de8a50d889a09e6f5642984775fe796ca943. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/core_ext/enumerable.rb activesupport/test/core_ext/enumerable_test.rb
* | Depend on 4.0.0.beta gems. Use https for github urls.Jeremy Kemper2011-12-222-11/+11
| |
* | Merge pull request #4135 from nashby/deprecate-uniq-byJosé Valim2011-12-222-12/+22
|\ \ | | | | | | deprecate Array#uniq_by and Array#uniq_by!
| * | deprecate Array#uniq_by and Array#uniq_by! in favor of Array#uniq and ↵Vasiliy Ermolovich2011-12-222-12/+22
| | | | | | | | | | | | Array#uniq! from ruby 1.9
* | | Merge pull request #4133 from lest/remove-1-8-codeJosé Valim2011-12-224-13/+0
|\ \ \ | | | | | | | | no more need to make Time#to_date and Time#to_datetime public
| * | | no more need to make Time#to_date and Time#to_datetime publicSergey Nartimov2011-12-224-13/+0
| |/ / | | | | | | | | | they are public in actual 1.9 ruby version (tested at least in 1.9.2-p180)
* | | Revert "Merge pull request #4114 from ↵Jon Leighton2011-12-222-78/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | alexeymuranov/my_fix_for_prefix_suffix_fixtures_test" This reverts commit f8e484d0f71114675ed04e987914d3f2815cb868, reversing changes made to fa5adfb1e884bf21a7071ade634a820e37ac4db4. Reason: broke the postgres tests.
* | | Merge pull request #4114 from ↵Jon Leighton2011-12-222-23/+78
|\ \ \ | |/ / |/| | | | | | | | alexeymuranov/my_fix_for_prefix_suffix_fixtures_test Fix a fixtures test case with table prefix/suffix
| * | Fix a fixtures test case with table prefix/suffixAlexey Muranov2011-12-222-23/+78
| | | | | | | | | Make sure the table name of a model is reset in a test case after assigning ActiveRecord::Base.table_name_prefix and ActiveRecord::Base.table_name_suffix. This was somebody else's test case, so an independent opinion on the change can be helpful.
* | | Update activesupport/lib/active_support.rbJosé Valim2011-12-221-1/+1
| | |
* | | Merge pull request #4121 from lest/remove-whiny-nilsJosé Valim2011-12-216-46/+6
|\ \ \ | | | | | | | | remove AS whiny nil extension and deprecate config.whiny_nils
| * | | remove AS whiny nil extension and deprecate config.whiny_nilsSergey Nartimov2011-12-226-46/+6
|/ / /
* | | Merge pull request #4125 from nashby/remove-process-daemonJosé Valim2011-12-214-32/+0
|\ \ \ | | | | | | | | remove Proces.daemon from core_ext
| * | | remove Proces.daemon from core_extVasiliy Ermolovich2011-12-224-32/+0
|/ / /
* | | just require things onceAaron Patterson2011-12-211-4/+2
| | |
* | | append puts the routes after the default, which causes a 404. instead use ↵Aaron Patterson2011-12-211-1/+1
| | | | | | | | | | | | prepend
* | | just use def setupAaron Patterson2011-12-211-1/+2
| | |