Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | updates to 3.2 release notes | Vijay Dev | 2012-01-04 | 1 | -1/+8 | |
| | ||||||
* | Final grammar checkup on 3.2 release notes. | Kristian Freeman | 2012-01-04 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #4288 from kennyj/fix_4285-2 | José Valim | 2012-01-03 | 2 | -1/+7 | |
|\ | | | | | (3-2-stable) Fix GH #4285. Remove options when we record calling create_table | |||||
| * | Fix GH #4285. Remove options when we record calling creat_table | kennyj | 2012-01-04 | 2 | -1/+7 | |
|/ | ||||||
* | When generating routes, the last defined named route wins. This is in | Aaron Patterson | 2012-01-03 | 1 | -15/+23 | |
| | | | | | | | | | | contrast to route recognition where the first recognized route wins. This behavior will not exist in Rails 4.0. See: https://github.com/rails/rails/issues/4245 https://github.com/rails/rails/issues/4164 | |||||
* | Revert "Named Routes shouldn't override existing ones (currently route ↵ | Aaron Patterson | 2012-01-03 | 2 | -3/+3 | |
| | | | | | | recognition goes with the earliest match, named routes use the latest match)" This reverts commit 71d769e3b58cb56b4b1d5143936c65be8b27c490. | |||||
* | Merge pull request #4283 from lest/fix-singleton-checking | Aaron Patterson | 2012-01-03 | 1 | -1/+1 | |
| | | | | use correct variant of checking whether class is a singleton | |||||
* | Merge pull request #4281 from lest/3-2-changelog | Santiago Pastorino | 2012-01-03 | 1 | -2/+4 | |
|\ | | | | | add CHANGELOG entry for AS::Base64 deprecation | |||||
| * | add CHANGELOG entry for AS::Base64 deprecation | Sergey Nartimov | 2012-01-03 | 1 | -2/+4 | |
|/ | ||||||
* | Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417 | Santiago Pastorino | 2012-01-03 | 2 | -2/+8 | |
| | ||||||
* | Merge pull request #4280 from lest/3-2-backport-callbacks | José Valim | 2012-01-03 | 1 | -28/+17 | |
|\ | | | | | backport changes in AS::Callbacks | |||||
| * | AS::Callbacks: remove __define_runner | Bogdan Gusiev | 2012-01-03 | 1 | -16/+3 | |
| | | ||||||
| * | Refactor AS::Callbacks | Bogdan Gusiev | 2012-01-03 | 1 | -6/+8 | |
| | | | | | | | | | | Extracted `__reset_runner` from `__define_runner` And call it in proper places | |||||
| * | AS::Callbacks: improved __define_runner performance | Bogdan Gusiev | 2012-01-03 | 1 | -3/+2 | |
| | | ||||||
| * | AS::Callbacks: improve __define_runner perfomance | Bogdan Gusiev | 2012-01-03 | 1 | -10/+11 | |
| | | ||||||
* | | Override respond_to? since we are also overriding method_missing. | José Valim | 2012-01-03 | 2 | -0/+11 | |
| | | ||||||
* | | Add font_path helper method | Santiago Pastorino | 2012-01-03 | 6 | -0/+41 | |
|/ | ||||||
* | Merge pull request #4279 from lest/fix-log | Aaron Patterson | 2012-01-03 | 1 | -1/+1 | |
| | | | | do not rewrite log during application bootstrap | |||||
* | Merge pull request #4278 from kennyj/fix_rdoc_generating_problem | Santiago Pastorino | 2012-01-03 | 1 | -1/+1 | |
| | | | | Use -e option instead of -c option (rake rdoc task). | |||||
* | Merge pull request #4275 from lest/3-2-deprecate-activesupport-base64 | José Valim | 2012-01-03 | 1 | -13/+18 | |
|\ | | | | | deprecate AS::Base64 methods without DeprecatedConstantProxy | |||||
| * | deprecate AS::Base64 methods without DeprecatedConstantProxy | Sergey Nartimov | 2012-01-03 | 1 | -13/+18 | |
| | | ||||||
* | | Deprecate Rails::Plugin in favor of gems | Santiago Pastorino | 2012-01-03 | 3 | -0/+5 | |
|/ | ||||||
* | Merge pull request #4273 from lest/fix-pg-version | José Valim | 2012-01-03 | 1 | -1/+5 | |
|\ | | | | | use pg 0.11.0 under ruby 1.8.7 | |||||
| * | use pg 0.11.0 under ruby 1.8.7 | Sergey Nartimov | 2012-01-03 | 1 | -1/+5 | |
|/ | ||||||
* | Merge pull request #4268 from lest/3-2-deprecate-activesupport-base64 | Xavier Noria | 2012-01-02 | 5 | -3/+5 | |
|\ | | | | | fix base64 requires | |||||
| * | fix base64 requires | Sergey Nartimov | 2012-01-03 | 5 | -3/+5 | |
|/ | ||||||
* | 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 |