Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4267 from lest/3-2-deprecate-activesupport-base64 | Xavier Noria | 2012-01-02 | 11 | -63/+70 |
|\ | | | | | deprecate ActiveSupport::Base64 | ||||
| * | deprecate ActiveSupport::Base64 | Sergey Nartimov | 2012-01-03 | 11 | -63/+70 |
|/ | | | | extend and define ::Base64 if needed | ||||
* | DRY up guides index page | Vijay Dev | 2012-01-01 | 3 | -48/+21 |
| | | | | | | Use the list of guides available in documents.yaml to fill in the menu in the index page instead of duplicating the list again. Also, remove WIP guides from the menu. | ||||
* | Fixed documentation error in code examples from form_tag_helper.rb | Alejandro Andrés | 2011-12-31 | 1 | -2/+2 |
| | |||||
* | SCSS processor is provided by the sass gem | Sam Umbach | 2011-12-31 | 1 | -1/+1 |
| | |||||
* | Minor readability improvements | Sam Umbach | 2011-12-31 | 1 | -13/+13 |
| | |||||
* | fix a couple of formatting issues | Vijay Dev | 2011-12-31 | 1 | -3/+2 |
| | |||||
* | remove wiki link | Vijay Dev | 2011-12-31 | 1 | -1/+0 |
| | |||||
* | Merge pull request #4227 from gazay/3-2-stable-marshalling | Aaron Patterson | 2011-12-30 | 2 | -1/+26 |
|\ | | | | | 3 2 stable marshalling | ||||
| * | Backward compatibility with 3.1 cache storing | Alexey Gaziev | 2011-12-29 | 2 | -1/+26 |
| | | |||||
* | | adds a comments that clarifies why Range#include? chooses the comparison ↵ | Xavier Noria | 2011-12-30 | 1 | -0/+1 |
| | | | | | | | | operator | ||||
* | | refactor Range#include? to handle ranges with floats | Sergey Nartimov | 2011-12-30 | 2 | -3/+6 |
| | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/range/include_range.rb | ||||
* | | fixing typo. Thanks Vijay! | Aaron Patterson | 2011-12-29 | 1 | -1/+1 |
| | | |||||
* | | revise some doc changes | Vijay Dev | 2011-12-29 | 1 | -9/+4 |
| | | |||||
* | | Documented about using :path option for resources | Kevin Moore | 2011-12-29 | 1 | -0/+7 |
| | | |||||
* | | Fixed formatting of code examples in form_tag_helper.rb | Alejandro Andrés | 2011-12-29 | 1 | -4/+4 |
| | | |||||
* | | Document that index names are made up of all columns, not just the first. | Jo Liss | 2011-12-29 | 1 | -9/+2 |
| | | | | | | | | | | | | | | | | | | | | | | index_name has been using the following expression "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}" since at least 2006 (bc7f2315), and that's how they come out in my DB. Please check that this is correct before merging into master, perhaps I'm misunderstanding the section I changed. | ||||
* | | Remove unnecessary comma. | Uģis Ozols | 2011-12-29 | 1 | -1/+1 |
|/ | |||||
* | 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 |
| |