Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids | Aaron Patterson | 2011-12-28 | 2 | -1/+11 | |
| | | | | allow reorder to affect eager loading correctly | |||||
* | Revert "Merge pull request #4196 from gazay/3-2-stable-marshalling" | Aaron Patterson | 2011-12-28 | 2 | -26/+1 | |
| | | | | | This reverts commit df3701872d6c97ff49943aea30761b47e60fa9fe, reversing changes made to a0fd9fb01730af12d66a27b5665cc010bd3b90b4. | |||||
* | last named route wins. fixes #4164 | Aaron Patterson | 2011-12-28 | 2 | -1/+41 | |
| | | | | | | This differs from route recognition where first recognized route wins. This will not be supported in Rails 4.0 so that route recognition and generation rules are consistent. | |||||
* | app code in general wants Time.current, not Time.now | Xavier Noria | 2011-12-28 | 1 | -3/+3 | |
| | ||||||
* | Revert "Further simplify singleton_class checking in class_attribute" | Jon Leighton | 2011-12-28 | 1 | -1/+14 | |
| | | | | | | This reverts commit 520918aad9b84eee807eb42fcb32f57c152d50e0. Reason: build failure | |||||
* | Merge pull request #4196 from gazay/3-2-stable-marshalling | Aaron Patterson | 2011-12-28 | 2 | -1/+26 | |
|\ | | | | | 3.2 stable marshalling | |||||
| * | Safe getting value from cache entry | Alexey Gaziev | 2011-12-27 | 2 | -1/+26 | |
| | | ||||||
* | | Add CHANGELOG entry | Santiago Pastorino | 2011-12-28 | 1 | -0/+2 | |
| | | ||||||
* | | Bump to rack 1.4.0 | Santiago Pastorino | 2011-12-28 | 1 | -1/+1 | |
| | | ||||||
* | | Further simplify singleton_class checking in class_attribute | James Miller | 2011-12-28 | 1 | -14/+1 | |
| | | ||||||
* | | Merge pull request #4217 from tapajos/patch-2 | Xavier Noria | 2011-12-28 | 1 | -1/+0 | |
|\ \ | | | | | | | Remove empty line | |||||
| * | | Remove empty line. | Marcos Tapajós | 2011-12-28 | 1 | -1/+0 | |
|/ / | ||||||
* | | Merge pull request #4210 from tapajos/patch-1 | José Valim | 2011-12-28 | 1 | -2/+3 | |
|\ \ | |/ |/| | Fix #4208 | |||||
| * | Closes #4208 | Marcos Tapajós | 2011-12-27 | 1 | -2/+3 | |
|/ | ||||||
* | Correctly display rack apps with dynamic constraints in RoutesInspector | Piotr Sarnacki | 2011-12-26 | 3 | -2/+28 | |
| | | | | | | | | | | | | | If you used dynamic constraint like that: scope :constraint => MyConstraint.new do mount RackApp => "/foo" end routes were not displayed correctly when using `rake routes`. This commit fixes it. If you want nice display of dynamic constraints in `rake routes` output, please just override to_s method in your constraint's class. | |||||
* | add back the version info to the title in guides index page | Vijay Dev | 2011-12-25 | 1 | -1/+1 | |
| | ||||||
* | Some fixes in rails guides generation | Vijay Dev | 2011-12-25 | 2 | -11/+9 | |
| | | | | | | | | * Passing edge information to the views fixes the lack of the edge badge and sets the appropriate welcome page on edgeguides.rubyonrails.org. * Changes in the welcome message to hyper link the rails tree based on the version. * Mention the Amazon url from where kindlegen can be downloaded. | |||||
* | fix kindle apps link in edge guides index | Vijay Dev | 2011-12-25 | 1 | -1/+1 | |
| | ||||||
* | Mip Earson -> Michael Pearson in changelog. | Michael Pearson | 2011-12-25 | 1 | -1/+1 | |
| | ||||||
* | registers guide generation for the Kindle and Kindle apps in the Changelog | Xavier Noria | 2011-12-25 | 1 | -0/+2 | |
| | ||||||
* | download guides for the Kindle and Kindle apps from the home page | Xavier Noria | 2011-12-25 | 4 | -6/+21 | |
| | ||||||
* | guides generation for the Kindle looking good now [Mip Earson & Xavier Noria] | Xavier Noria | 2011-12-25 | 1 | -9/+15 | |
| | ||||||
* | Merge pull request #4175 from kuroda/3-2-stable | Aaron Patterson | 2011-12-24 | 1 | -0/+1 | |
|\ | | | | | Reconnect to the first database after db:create | |||||
| * | Reconnect to the first database after db:create | Tsutomu Kuroda | 2011-12-25 | 1 | -0/+1 | |
|/ | | | | | Otherwise, the schema and seed will be loaded onto the test database. | |||||
* | (draft) guides for the Kindle and Kindle apps [Mip Earson & Xavier Noria] | Xavier Noria | 2011-12-24 | 16 | -197/+483 | |
| | ||||||
* | Last attempt to fix 1.8.7 tests. | José Valim | 2011-12-24 | 3 | -8/+15 | |
| | ||||||
* | avoid deprecation warnings when running AR tests | Aaron Patterson | 2011-12-24 | 2 | -2/+7 | |
| | ||||||
* | delegating and deprecating logger#silence. fixes #4159 | Aaron Patterson | 2011-12-24 | 3 | -16/+33 | |
| | ||||||
* | assert_not_match -> assert_no_match. | José Valim | 2011-12-24 | 2 | -6/+6 | |
| | ||||||
* | add latest changes to 3.2 release notes | Vijay Dev | 2011-12-24 | 1 | -0/+14 | |
| | ||||||
* | minor edits in caching guide | Vijay Dev | 2011-12-24 | 1 | -3/+3 | |
| | ||||||
* | Fix regexp intervals. | José Valim | 2011-12-24 | 1 | -2/+2 | |
| | ||||||
* | Update CHANGELOGs. | José Valim | 2011-12-24 | 2 | -0/+4 | |
| | ||||||
* | Tidy up migration types. | José Valim | 2011-12-24 | 13 | -61/+81 | |
| | ||||||
* | added ability to specify from cli when generating a model/migration whether ↵ | Dmitrii Samoilov | 2011-12-24 | 12 | -18/+200 | |
| | | | | particular property should be an index like this 'rails g model person name:string:index profile:string' | |||||
* | Remove unecessary config_accessors. | José Valim | 2011-12-24 | 3 | -11/+5 | |
| | ||||||
* | Provide a class optin for page_cache_compression. | José Valim | 2011-12-24 | 2 | -20/+24 | |
| | ||||||
* | Gzip files on page caching | Andrey A.I. Sitnik | 2011-12-24 | 3 | -5/+90 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Remove broken #compute_source_path | Jeremy Kemper | 2011-12-23 | 1 | -5/+0 | |
| | ||||||
* | Fix situation where id method didn't get defined causing postgres to fail | Jon Leighton | 2011-12-23 | 1 | -4/+3 | |
| | ||||||
* | 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 #4141 from arunagw/fix_build | José Valim | 2011-12-22 | 1 | -4/+3 | |
|\ | | | | | Fix build 3-2-stable | |||||
| * | Fix build when IM=true | Jon Leighton | 2011-12-23 | 1 | -4/+3 | |
|/ | ||||||
* | 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 | |
| | ||||||
* | Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable | Aaron Patterson | 2011-12-22 | 8 | -62/+61 | |
|\ | | | | | | | | | | | | | * '3-2-stable' of github.com:rails/rails: Use sass-rails >= 3.2.2 for new apps Make ActiveRecord::Relation#pluck work with serialized attributes Make read_attribute code path accessible at the class level |