aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Final grammar checkup on 3.2 release notes.Kristian Freeman2012-01-041-1/+1
|
* Merge pull request #4288 from kennyj/fix_4285-2José Valim2012-01-032-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_tablekennyj2012-01-042-1/+7
|/
* When generating routes, the last defined named route wins. This is inAaron Patterson2012-01-031-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 Patterson2012-01-032-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-checkingAaron Patterson2012-01-031-1/+1
| | | | use correct variant of checking whether class is a singleton
* Merge pull request #4281 from lest/3-2-changelogSantiago Pastorino2012-01-031-2/+4
|\ | | | | add CHANGELOG entry for AS::Base64 deprecation
| * add CHANGELOG entry for AS::Base64 deprecationSergey Nartimov2012-01-031-2/+4
|/
* Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417Santiago Pastorino2012-01-032-2/+8
|
* Merge pull request #4280 from lest/3-2-backport-callbacksJosé Valim2012-01-031-28/+17
|\ | | | | backport changes in AS::Callbacks
| * AS::Callbacks: remove __define_runnerBogdan Gusiev2012-01-031-16/+3
| |
| * Refactor AS::CallbacksBogdan Gusiev2012-01-031-6/+8
| | | | | | | | | | Extracted `__reset_runner` from `__define_runner` And call it in proper places
| * AS::Callbacks: improved __define_runner performanceBogdan Gusiev2012-01-031-3/+2
| |
| * AS::Callbacks: improve __define_runner perfomanceBogdan Gusiev2012-01-031-10/+11
| |
* | Override respond_to? since we are also overriding method_missing.José Valim2012-01-032-0/+11
| |
* | Add font_path helper methodSantiago Pastorino2012-01-036-0/+41
|/
* Merge pull request #4279 from lest/fix-logAaron Patterson2012-01-031-1/+1
| | | | do not rewrite log during application bootstrap
* Merge pull request #4278 from kennyj/fix_rdoc_generating_problemSantiago Pastorino2012-01-031-1/+1
| | | | Use -e option instead of -c option (rake rdoc task).
* Merge pull request #4275 from lest/3-2-deprecate-activesupport-base64José Valim2012-01-031-13/+18
|\ | | | | deprecate AS::Base64 methods without DeprecatedConstantProxy
| * deprecate AS::Base64 methods without DeprecatedConstantProxySergey Nartimov2012-01-031-13/+18
| |
* | Deprecate Rails::Plugin in favor of gemsSantiago Pastorino2012-01-033-0/+5
|/
* Merge pull request #4273 from lest/fix-pg-versionJosé Valim2012-01-031-1/+5
|\ | | | | use pg 0.11.0 under ruby 1.8.7
| * use pg 0.11.0 under ruby 1.8.7Sergey Nartimov2012-01-031-1/+5
|/
* Merge pull request #4268 from lest/3-2-deprecate-activesupport-base64Xavier Noria2012-01-025-3/+5
|\ | | | | fix base64 requires
| * fix base64 requiresSergey Nartimov2012-01-035-3/+5
|/
* Merge pull request #4267 from lest/3-2-deprecate-activesupport-base64Xavier Noria2012-01-0211-63/+70
|\ | | | | deprecate ActiveSupport::Base64
| * deprecate ActiveSupport::Base64Sergey Nartimov2012-01-0311-63/+70
|/ | | | extend and define ::Base64 if needed
* DRY up guides index pageVijay Dev2012-01-013-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.rbAlejandro Andrés2011-12-311-2/+2
|
* SCSS processor is provided by the sass gemSam Umbach2011-12-311-1/+1
|
* Minor readability improvementsSam Umbach2011-12-311-13/+13
|
* fix a couple of formatting issuesVijay Dev2011-12-311-3/+2
|
* remove wiki linkVijay Dev2011-12-311-1/+0
|
* Merge pull request #4227 from gazay/3-2-stable-marshallingAaron Patterson2011-12-302-1/+26
|\ | | | | 3 2 stable marshalling
| * Backward compatibility with 3.1 cache storingAlexey Gaziev2011-12-292-1/+26
| |
* | adds a comments that clarifies why Range#include? chooses the comparison ↵Xavier Noria2011-12-301-0/+1
| | | | | | | | operator
* | refactor Range#include? to handle ranges with floatsSergey Nartimov2011-12-302-3/+6
| | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/range/include_range.rb
* | fixing typo. Thanks Vijay!Aaron Patterson2011-12-291-1/+1
| |
* | revise some doc changesVijay Dev2011-12-291-9/+4
| |
* | Documented about using :path option for resourcesKevin Moore2011-12-291-0/+7
| |
* | Fixed formatting of code examples in form_tag_helper.rbAlejandro Andrés2011-12-291-4/+4
| |
* | Document that index names are made up of all columns, not just the first.Jo Liss2011-12-291-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 Ozols2011-12-291-1/+1
|/
* Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_idsAaron Patterson2011-12-282-1/+11
| | | | allow reorder to affect eager loading correctly
* Revert "Merge pull request #4196 from gazay/3-2-stable-marshalling"Aaron Patterson2011-12-282-26/+1
| | | | | This reverts commit df3701872d6c97ff49943aea30761b47e60fa9fe, reversing changes made to a0fd9fb01730af12d66a27b5665cc010bd3b90b4.
* last named route wins. fixes #4164Aaron Patterson2011-12-282-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.nowXavier Noria2011-12-281-3/+3
|
* Revert "Further simplify singleton_class checking in class_attribute"Jon Leighton2011-12-281-1/+14
| | | | | | This reverts commit 520918aad9b84eee807eb42fcb32f57c152d50e0. Reason: build failure
* Merge pull request #4196 from gazay/3-2-stable-marshallingAaron Patterson2011-12-282-1/+26
|\ | | | | 3.2 stable marshalling
| * Safe getting value from cache entryAlexey Gaziev2011-12-272-1/+26
| |