aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improved the comment for config.assets.manifest in the asset_pipeline guides.Anuj Dutta2012-03-281-1/+1
|
* Changed the config.assets.manifest path in the comments to nil.Anuj Dutta2012-03-282-2/+2
|
* 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
| | | | | | | | | | | | | | This reverts commit 7feec40b89ada892ca6f107ada27ceedde505d83. Reason: The guide had the contents of railties/bin/rails and I don't see any reason to change it.
| * 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
| | | | | | | | It is in response for confusion in issue #5301
| * Missing generated query for pluck method. Juanjo Bazán2012-03-271-1/+1
| | | | | | (and changed the use of true for a more database agnostic example).
| * 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
| | | | | | | | | | this adds documentation for -e flag which sets the environment of the rails console like the `rails server` command.
| * 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 variables
| * | removed unused variablesArun Agrawal2012-03-271-2/+2
| | |
* | | If partial is rendered in controller, grab format from templatePiotr Sarnacki2012-03-273-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header.
* | | Merge pull request #5609 from tjmcewan/masterJosé Valim2012-03-272-0/+2
|\ \ \ | |/ / |/| | prevent returning a negative zero from number_with_precision
| * | 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"
| * | Remove 'needless boolean casting'.Jack Chen (chendo)2012-03-261-1/+1
| | | | | | | | | | | | | | | "Predicates in Rails rely on standard Ruby semantics for boolean values and guarantee no singletons whatsoever." - @fxn
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | When someone accidentally passes a string to sanitize like: sanitize("<span>foo</span>", :tags => "b") there is no indication that it's the wrong way and span will not be removed.
* | | favor composition over inheritanceAaron Patterson2012-03-262-8/+30
| | |
* | | Merge pull request #2621 from icco/masterAaron Patterson2012-03-261-1/+1
|\ \ \ | | | | | | | | Issue with schema dump
| * | | 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
|\ \ \ \ \ | | | | | | | | | | | | Cookie store session hash
| * | | | | Remove warning added by my own commit :fire:Carlos Antonio da Silva2012-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Commit: 7a0cf2f5294e8bcef547642435636b394340a3e4
| * | | | | 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.rb
| * | | | | | 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
| * | | | | | 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 FormBuilder
| * | | | | | | Properly deprecate the block argument in AV FormBuilderCarlos Antonio da Silva2012-03-232-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 56089ca986c767763f29159c8de0aa1ebabfd4d2 introduced a backward incompatible change by changing the method signature of the FormBuilder. This brings back the same method signature warning in case someone gives a block to the builder. More info: https://github.com/rails/rails/commit/56089ca986c767763f29159c8de0aa1ebabfd4d2#commitcomment-1116166
* | | | | | | | 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_select
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #2737 Conflicts: activerecord/lib/active_record/coders/yaml_column.rb
* | | | | | | | | 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 Gemfile
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-11 18:47:11 +0000