aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4412 from kennyj/fix_3743Santiago Pastorino2012-01-111-0/+2
* Some revisions to the release notes guideVijay Dev2012-01-111-13/+13
* add documentation explaining reorder behaviorMatt Jones2012-01-111-0/+10
* Made an example a little more realisticcodesnik2012-01-111-1/+1
* Merge pull request #4408 from tomstuart/read-and-write-attribute-aliasesSantiago Pastorino2012-01-112-5/+46
* Merge pull request #4404 from rizwanreza/edits-to-spastorino-upgrade-notesSantiago Pastorino2012-01-111-11/+8
|\
| * Edits to spastorino's additions in 3.2 Release NotesRizwan Reza2012-01-111-11/+8
|/
* FFFFFFFFUUUUUUUUUUUUUUUUUUUUUUUUU :bomb:Aaron Patterson2012-01-101-3/+0
* deprecate the subdirectories parameter to `migrations`Aaron Patterson2012-01-101-2/+13
* Add "What to update in your apps" section to the release notes guideSantiago Pastorino2012-01-101-0/+29
* Remove duplicated test line which was causing Ci failures on 1.8.7.José Valim2012-01-101-1/+0
* Remove dead codeSantiago Pastorino2012-01-101-4/+0
* Add CHANGELOG entrySantiago Pastorino2012-01-101-0/+2
* Rails initialization with initialize_on_precompile = false should set assets_dirSantiago Pastorino2012-01-102-1/+10
* Fix http digest authentication with trailing '/' or '?' (fixes #4038 and #3228)Piotr Sarnacki2012-01-102-7/+51
* Add original_fullpath and original_url methods to RequestPiotr Sarnacki2012-01-102-0/+32
* Add ORIGINAL_FULLPATH to envPiotr Sarnacki2012-01-103-1/+54
* Merge pull request #4352 from kennyj/improve_3694-2José Valim2012-01-061-3/+3
|\
| * Don't fork a process when assets:precompile:nondigest is invoked in assets:pr...kennyj2012-01-071-3/+3
|/
* Depend on coffee-rails 3.2.1Santiago Pastorino2012-01-051-1/+1
* 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