aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | 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
* | | | | | | | Merge pull request #5592 from nashby/fix-issue-5584Piotr Sarnacki2012-03-262-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | String#titleize works properly with smart quotes, closes #5584Vasiliy Ermolovich2012-03-262-3/+7
* | | | | | | | | Merge pull request #5561 from carlosantoniodasilva/form-builder-block-argAaron Patterson2012-03-262-3/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Properly deprecate the block argument in AV FormBuilderCarlos Antonio da Silva2012-03-232-3/+21
* | | | | | | | | | Don't depend on ivars. Thanks @fesplugasAaron Patterson2012-03-261-1/+1
* | | | | | | | | | Merge pull request #5594 from lest/patch-1Piotr Sarnacki2012-03-262-1/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply form_for namespace option to date_selectSergey Nartimov2012-03-262-1/+12
* | | | | | | | | | | ActiveRecord::Coders::YAMLColumn#dump should raise an errorGuten2012-03-262-1/+14
* | | | | | | | | | | Merge pull request #5595 from guilleiguaran/sprockets-rails-1.0.0Aaron Patterson2012-03-261-2/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | sprockets-rails 1.0.0 was released, remove git dependency from GemfileGuillermo Iguaran2012-03-261-2/+0
* | | | | | | | | | | no need to freeze things all the timeAaron Patterson2012-03-261-8/+7
* | | | | | | | | | | test against ruby features in order to fix tests on Ruby 2.0Aaron Patterson2012-03-261-1/+9
* | | | | | | | | | | Merge pull request #5593 from lukesarnacki/activemodel_name_composition_over_...Aaron Patterson2012-03-262-12/+17
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | ActiveModel::Name does not inherit from stringLukasz Sarnacki2012-03-262-12/+17
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #5183 from lest/patch-1José Valim2012-03-261-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use content_tag in button_to helperSergey Nartimov2012-03-141-2/+3
* | | | | | | | | | | Merge pull request #5581 from jamie/custom_param_fieldJosé Valim2012-03-262-4/+23
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Allow a defining custom member field on resourcesJamie Macey2012-03-252-4/+23
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #5575 from phiggins/remove_conditional_from_statistics_taskXavier Noria2012-03-251-7/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove useless conditional.Pete Higgins2012-03-251-7/+1
|/ / / / / / / / / /