aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'gzip-index' which contains two features:José Valim2011-12-2418-53/+338
|\ | | | | | | | | | | | | | | | | | | 1) Adding gzip to pages cache, closes #4124 2) Allow scaffold/model/migration generators to accept a "index" and "uniq" modifiers, as in: "tracking_id:integer:uniq" in order to generate (unique) indexes. Some types also accept custom options, for instance, you can specify the precision and scale for decimals as "price:decimal{7,2}". This feature closes #2555.
| * Tidy up migration types.José Valim2011-12-2413-61/+81
| |
| * added ability to specify from cli when generating a model/migration whether ↵Dmitrii Samoilov2011-12-2412-18/+200
| | | | | | | | particular property should be an index like this 'rails g model person name:string:index profile:string'
| * Remove unecessary config_accessors.José Valim2011-12-243-11/+5
| |
| * Provide a class optin for page_cache_compression.José Valim2011-12-242-20/+24
| |
| * Gzip files on page cachingAndrey A.I. Sitnik2011-12-243-5/+90
|/ | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge pull request #4149 from castlerock/remove_1.8_stuffJosé Valim2011-12-241-7/+0
|\ | | | | remove ruby 1.8 stuff method skip to support ruby 1.8 series
| * remove ruby 1.8 stuff skip hack from ARVishnu Atrai2011-12-231-7/+0
| |
* | Merge pull request #4147 from lest/remove-app-fallbackJosé Valim2011-12-244-3/+16
|\ \ | | | | | | remove Rails application fallback from AD::IntegrationTest
| * | remove Rails application fallback from AD::IntegrationTestSergey Nartimov2011-12-234-3/+16
| |/ | | | | | | set AD::IntegrationTest.app in railtie initializer
* | Merge pull request #4156 from nashby/to-sym-ruby-18Jeremy Kemper2011-12-231-2/+1
|\ \ | | | | | | remove checking for non-empty string before calling to_sym
| * | remove checking for non-empty string before calling to_symVasiliy Ermolovich2011-12-241-2/+1
| | |
* | | Remove broken #compute_source_pathJeremy Kemper2011-12-231-5/+0
| | |
* | | 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