aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #4311 from kuroda/3-2-negative_formatAaron Patterson2012-01-052-0/+8
|\
| * Infer currency negative format from positive one.Tsutomu Kuroda2012-01-052-0/+8
|/
* Bump to rc2Santiago Pastorino2012-01-049-9/+9
* Revert "AS::Callbacks: remove __define_runner"José Valim2012-01-041-3/+16
* Add release notes URL to vendor/plugins deprecation warning. Update CHANGELOG.Jeremy Kemper2012-01-042-2/+2
* Clarify vendor/plugins deprecation warningJeremy Kemper2012-01-041-1/+1
* Merge pull request #4282 from edgecase/order_after_reorderAaron Patterson2012-01-046-9/+25
* Use sass-rails 3.2.3Santiago Pastorino2012-01-041-1/+1
* Revert "use pg 0.11.0 under ruby 1.8.7"Santiago Pastorino2012-01-041-5/+1
* copy editsVijay Dev2012-01-041-10/+7
* improve doc in number helper optionsPablo Ifran2012-01-041-19/+57
* General editing pass over assets pipeline guideMike Gunderloy2012-01-041-56/+58
* updates to 3.2 release notesVijay Dev2012-01-041-1/+8
* 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
|\
| * 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
* Revert "Named Routes shouldn't override existing ones (currently route recogn...Aaron Patterson2012-01-032-3/+3
* Merge pull request #4283 from lest/fix-singleton-checkingAaron Patterson2012-01-031-1/+1
* 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