aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | remove redundant variableDmitrii Golub2012-03-281-2/+1
| |/ / / / /
* | | | | | Merge pull request #5616 from cbartlett/migration-indentSantiago Pastorino2012-03-271-2/+2
|\ \ \ \ \ \
| * | | | | | Fix indenting in migration generatorColin Bartlett2012-03-271-2/+2
* | | | | | | Merge pull request #5621 from rafaelfranca/fix-2492-masterJeremy Kemper2012-03-272-3/+37
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-273-18/+23
| * | | | | | Fixing issue #2492 for master branch. ActionView::Base.field_error_proc doesn...Andrey Samsonov2012-03-272-2/+31
* | | | | | | Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-masterSantiago Pastorino2012-03-273-8/+12
|\ \ \ \ \ \ \
| * | | | | | | Don't break Haml with textarea newline fix.James Coleman2012-03-273-8/+12
* | | | | | | | Remove Arel::Relation constant from PredicateBuilder.Juanjo Bazán2012-03-271-2/+2
* | | | | | | | adds delegetion for eof? to AD::Http::UploadedFileJens Fahnenbruck2012-03-272-1/+7
|/ / / / / / /
* | | | | | / attributes are cached by string keys, so to_s to support symbols. fixes #5549Aaron Patterson2012-03-273-2/+17
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-278-6/+69
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | minor edits in testing guide [ci skip]Vijay Dev2012-03-271-4/+2
| * | | | | add missing do [ci skip]Vijay Dev2012-03-271-1/+1
| * | | | | Revert "[ci skip] updated bin/rails code in Rails Initialization Process guide"Vijay Dev2012-03-271-16/+6
| * | | | | Proc objects for caches_page no need controller objectAlexey Vakhov2012-03-271-1/+1
| * | | | | added shallow_prefix option description in documantationLukasz Sarnacki2012-03-271-0/+19
| * | | | | Missing generated query for pluck method. Juanjo Bazán2012-03-271-1/+1
| * | | | | Made it a bit more clear where to run rails/serverDimitri De Frenne2012-03-261-1/+1
| * | | | | Fixed typo in pathDimitri De Frenne2012-03-261-1/+1
| * | | | | document `-e` argument for rails consoleschneems2012-03-241-0/+6
| * | | | | Testing layout gotcha when view renders partialPanayotis Matsinopoulos2012-03-241-0/+16
| * | | | | Small layout correctionPanayotis Matsinopoulos2012-03-241-2/+1
| * | | | | Testing Template and Layout ExamplePanayotis Matsinopoulos2012-03-241-0/+25
| * | | | | Use one 'be'.Waseem Ahmad2012-03-241-1/+1
| * | | | | Fix AC actions caching commentAlexey Vakhov2012-03-241-1/+1
| * | | | | [ci skip] updated bin/rails code in Rails Initialization Process guideSenthil A2012-03-241-6/+16
* | | | | | Merge pull request #5499 from arunagw/remove_unused_codeSantiago Pastorino2012-03-271-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | removed unused variablesArun Agrawal2012-03-271-2/+2
* | | | | | If partial is rendered in controller, grab format from templatePiotr Sarnacki2012-03-273-2/+22
* | | | | | Merge pull request #5609 from tjmcewan/masterJosé Valim2012-03-272-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | change number_with_precision to not return negative zerosTim McEwan2012-03-272-0/+2
|/ / / / /
* | | | | Merge pull request #5582 from chendo/masterXavier Noria2012-03-261-1/+1
|\ \ \ \ \
| * | | | | Remove 'needless boolean casting'.Jack Chen (chendo)2012-03-261-1/+1
* | | | | | favor composition over inheritanceAaron Patterson2012-03-261-5/+20
* | | | | | Don't ignore non Enumerable values passed to sanitize (closes #5585)Piotr Sarnacki2012-03-272-0/+29
* | | | | | favor composition over inheritanceAaron Patterson2012-03-262-8/+30
* | | | | | Merge pull request #2621 from icco/masterAaron Patterson2012-03-261-1/+1
|\ \ \ \ \ \
| * | | | | | Not checking for nil is apparently a lot faster.Nat Welch2011-09-211-1/+1
| * | | | | | Merge branch 'master' of git://github.com/rails/railsNat Welch2011-09-21349-3121/+6229
| |\ \ \ \ \ \
| * | | | | | | From @dasch's recommendation.Nat Welch2011-08-221-1/+1
| * | | | | | | Fixes bug with schema dumper when using with Padrino.Nat Welch2011-08-211-1/+1
* | | | | | | | Merge pull request #5601 from carlosantoniodasilva/cookie-store-session-hashAaron Patterson2012-03-262-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove warning added by my own commit :fire:Carlos Antonio da Silva2012-03-261-1/+1
| * | | | | | | | Return the same session data object when setting session idCarlos Antonio da Silva2012-03-261-1/+2
* | | | | | | | | Merge pull request #5331 from castlerock/remove_unused_requireAaron Patterson2012-03-261-2/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove unused require from AS/core_ext/class/delegating_att.rbVishnu Atrai2012-03-101-2/+0
* | | | | | | | | | still need to ensure the path is a directoryAaron Patterson2012-03-261-1/+1
* | | | | | | | | | eliminating a branch we do not need. thanks @jeremyAaron Patterson2012-03-261-30/+3
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | stop using *args in order to simplify our constructorAaron Patterson2012-03-261-5/+4