aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4281 from lest/3-2-changelogSantiago Pastorino2012-01-031-2/+4
|\
| * 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
|\
| * AS::Callbacks: remove __define_runnerBogdan Gusiev2012-01-031-16/+3
| * Refactor AS::CallbacksBogdan Gusiev2012-01-031-6/+8
| * 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
* Merge pull request #4278 from kennyj/fix_rdoc_generating_problemSantiago Pastorino2012-01-031-1/+1
* Merge pull request #4275 from lest/3-2-deprecate-activesupport-base64José Valim2012-01-031-13/+18
|\
| * 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.7Sergey Nartimov2012-01-031-1/+5
|/
* Merge pull request #4268 from lest/3-2-deprecate-activesupport-base64Xavier Noria2012-01-025-3/+5
|\
| * 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::Base64Sergey Nartimov2012-01-0311-63/+70
|/
* DRY up guides index pageVijay Dev2012-01-013-48/+21
* 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
|\
| * Backward compatibility with 3.1 cache storingAlexey Gaziev2011-12-292-1/+26
* | adds a comments that clarifies why Range#include? chooses the comparison oper...Xavier Noria2011-12-301-0/+1
* | refactor Range#include? to handle ranges with floatsSergey Nartimov2011-12-302-3/+6
* | 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
* | 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
* Revert "Merge pull request #4196 from gazay/3-2-stable-marshalling"Aaron Patterson2011-12-282-26/+1
* last named route wins. fixes #4164Aaron Patterson2011-12-282-1/+41
* 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
* Merge pull request #4196 from gazay/3-2-stable-marshallingAaron Patterson2011-12-282-1/+26
|\
| * Safe getting value from cache entryAlexey Gaziev2011-12-272-1/+26
* | Add CHANGELOG entrySantiago Pastorino2011-12-281-0/+2
* | Bump to rack 1.4.0Santiago Pastorino2011-12-281-1/+1
* | Further simplify singleton_class checking in class_attributeJames Miller2011-12-281-14/+1
* | Merge pull request #4217 from tapajos/patch-2Xavier Noria2011-12-281-1/+0
|\ \
| * | Remove empty line.Marcos Tapajós2011-12-281-1/+0
|/ /
* | Merge pull request #4210 from tapajos/patch-1José Valim2011-12-281-2/+3
|\ \ | |/ |/|