Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | stop test resetting global state | Jon Leighton | 2011-12-23 | 1 | -0/+6 |
| | |||||
* | Fix situation where id method didn't get defined causing postgres to fail | Jon Leighton | 2011-12-23 | 1 | -4/+3 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-24 | 5 | -22/+27 |
|\ | | | | | | | | | Conflicts: railties/guides/source/active_support_core_extensions.textile | ||||
| * | AM::MAS.attr_protected: rework usage example. | Bogdan Gusiev | 2011-12-23 | 1 | -9/+9 |
| | | |||||
| * | Added link in MIT license for Action Mailer README. I think this seems ↵ | Kristian Freeman | 2011-12-22 | 1 | -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 Freeman | 2011-12-22 | 1 | -1/+3 |
| | | | | | | | | appropriate. | ||||
| * | Readability in Action Mailer README. | Kristian Freeman | 2011-12-22 | 1 | -3/+3 |
| | | |||||
| * | Correct grammar on Mailer generator -- passES. Working on enhancing ↵ | Kristian Freeman | 2011-12-22 | 1 | -1/+1 |
| | | | | | | | | conventional readability in README and USAGE files. | ||||
| * | [docs] pluck docs reverted for activesupport | Arun Agrawal | 2011-12-23 | 1 | -10/+0 |
| | | | | | | https://github.com/rails/rails/commit/367741ef22d1538b8550cf6e4b2276a0946066c0 | ||||
| * | Fixed AM::MasAsSec.attr_protected usage example. | Bogdan Gusiev | 2011-12-22 | 1 | -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 doc | Bogdan Gusiev | 2011-12-22 | 1 | -1/+1 |
| | | |||||
| * | [docs] Added missing "}" fixes #4126 | Arun Agrawal | 2011-12-22 | 1 | -1/+1 |
| | | |||||
* | | Rails 3.2 Release Notes | Vijay Dev | 2011-12-24 | 1 | -0/+429 |
| | | |||||
* | | Doh, remove debugging line | Jon Leighton | 2011-12-23 | 1 | -1/+0 |
| | | |||||
* | | Fix #4046. | Jon Leighton | 2011-12-23 | 5 | -46/+58 |
| | | |||||
* | | serialize fails on subclass | Alvaro Bautista | 2011-12-23 | 4 | -6/+32 |
| | | |||||
* | | removes Enumerable#pluck from the AS guide | Xavier Noria | 2011-12-23 | 1 | -10/+0 |
| | | |||||
* | | Merge pull request #4140 from kuroda/databases_rake | Aaron Patterson | 2011-12-22 | 1 | -0/+1 |
|\ \ | | | | | | | Reconnect to the first database after db:create | ||||
| * | | Reconnect to the first database after db:create | Tsutomu Kuroda | 2011-12-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | Otherwise, the schema and seed will be loaded onto the test database. | ||||
* | | | Merge pull request #4142 from lest/remove-1-8-code | José Valim | 2011-12-22 | 1 | -21/+0 |
|\ \ \ | |/ / |/| | | remove Enumerable#each_with_object again | ||||
| * | | remove Enumerable#each_with_object again | Sergey Nartimov | 2011-12-23 | 1 | -21/+0 |
|/ / | | | | | | | it come back occasionally in 367741ef | ||||
* | | adding an integration test for splat regexp substitutions. fixes #4138 | Aaron Patterson | 2011-12-22 | 1 | -0/+13 |
| | | |||||
* | | Adding an integration test. Fixes #4136 | Aaron Patterson | 2011-12-22 | 1 | -0/+9 |
| | | |||||
* | | Fix build when IM=true | Jon Leighton | 2011-12-22 | 1 | -4/+3 |
| | | |||||
* | | Delete unnecessary line that was necessary before I changed the code and it ↵ | Jon Leighton | 2011-12-22 | 1 | -1/+0 |
| | | | | | | | | became no longer necessary. | ||||
* | | adds deprecation warnings to the RDoc of Array#uniq_by(!) | Xavier Noria | 2011-12-20 | 1 | -2/+6 |
| | | |||||
* | | removes some unnecessary selfs | Xavier Noria | 2011-12-20 | 1 | -3/+3 |
| | | |||||
* | | rack bodies should be a list | Aaron Patterson | 2011-12-22 | 1 | -7/+7 |
| | | |||||
* | | refactoring routing tests | Aaron Patterson | 2011-12-22 | 1 | -34/+19 |
| | | |||||
* | | Remove 1.8 backport | Jon Leighton | 2011-12-22 | 1 | -9/+0 |
| | | |||||
* | | remove conflict marker | Vijay Dev | 2011-12-23 | 1 | -1/+0 |
| | | |||||
* | | Make ActiveRecord::Relation#pluck work with serialized attributes | Jon Leighton | 2011-12-22 | 2 | -5/+12 |
| | | |||||
* | | Make read_attribute code path accessible at the class level | Jon Leighton | 2011-12-22 | 5 | -56/+48 |
| | | |||||
* | | Revert "Added Enumerable#pluck to wrap the common pattern of ↵ | Aaron Patterson | 2011-12-22 | 3 | -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 Kemper | 2011-12-22 | 2 | -11/+11 |
| | | |||||
* | | Merge pull request #4135 from nashby/deprecate-uniq-by | José Valim | 2011-12-22 | 2 | -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 Ermolovich | 2011-12-22 | 2 | -12/+22 |
| | | | | | | | | | | | | Array#uniq! from ruby 1.9 | ||||
* | | | Merge pull request #4133 from lest/remove-1-8-code | José Valim | 2011-12-22 | 4 | -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 public | Sergey Nartimov | 2011-12-22 | 4 | -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 Leighton | 2011-12-22 | 2 | -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 Leighton | 2011-12-22 | 2 | -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/suffix | Alexey Muranov | 2011-12-22 | 2 | -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.rb | José Valim | 2011-12-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #4121 from lest/remove-whiny-nils | José Valim | 2011-12-21 | 6 | -46/+6 |
|\ \ \ | | | | | | | | | remove AS whiny nil extension and deprecate config.whiny_nils | ||||
| * | | | remove AS whiny nil extension and deprecate config.whiny_nils | Sergey Nartimov | 2011-12-22 | 6 | -46/+6 |
|/ / / | |||||
* | | | Merge pull request #4125 from nashby/remove-process-daemon | José Valim | 2011-12-21 | 4 | -32/+0 |
|\ \ \ | | | | | | | | | remove Proces.daemon from core_ext | ||||
| * | | | remove Proces.daemon from core_ext | Vasiliy Ermolovich | 2011-12-22 | 4 | -32/+0 |
|/ / / | |||||
* | | | just require things once | Aaron Patterson | 2011-12-21 | 1 | -4/+2 |
| | | | |||||
* | | | append puts the routes after the default, which causes a 404. instead use ↵ | Aaron Patterson | 2011-12-21 | 1 | -1/+1 |
| | | | | | | | | | | | | prepend | ||||
* | | | just use def setup | Aaron Patterson | 2011-12-21 | 1 | -1/+2 |
| | | |