aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unused config variable from test.rb templateGuillermo Iguaran2011-09-051-3/+0
* Merge pull request #2860 from guilleiguaran/fix-assets-behaviorSantiago Pastorino2011-09-042-2/+28
|\
| * AssetNotPrecompiledError should be raise when config.assets.digest = false, c...Guillermo Iguaran2011-09-042-2/+28
* | * is not allowed in windows file names. Closes #2574 #2847Santiago Pastorino2011-09-042-1/+1
* | Merge pull request #2855 from arunagw/fix_find_in_batches_masterJon Leighton2011-09-043-1/+31
|\ \ | |/ |/|
| * We need to recorder here. Need to drop the order from default scope.Arun Agrawal2011-09-053-1/+31
|/
* Merge pull request #2852 from milandobrota/remove_unneeded_explicit_nil_checksJon Leighton2011-09-047-11/+11
|\
| * if ... nil? is more expensive than unlessMilan Dobrota2011-09-047-11/+11
|/
* Merge docrails, resolving conflicts in the assets guideVijay Dev2011-09-049-24/+26
|\
| * minor fixes in assets guideVijay Dev2011-09-041-11/+9
| * Merge pull request #64 from rinaldifonseca/masterGuillermo Iguaran2011-09-031-1/+1
| |\
| | * Added |t| to create_table blockRinaldi Fonseca2011-09-041-1/+1
| |/
| * add some missing dots in the docsVijay Dev2011-09-041-4/+4
| * Fix asset_path example in CSS and ERB sectionGuillermo Iguaran2011-09-021-1/+1
| * document send_file guesses content type from the file extensionVijay Dev2011-09-031-1/+3
| * fix YUI descriptionRichard Hulse2011-09-031-1/+1
| * Fixed a typo in the section about migration.David Peckham2011-09-021-1/+1
| * some of the changes for validation earlier reverted from d20281aVijay Dev2011-09-033-4/+6
| * Change photos_path to photos_url in Using redirect_toFranco Catena2011-09-021-1/+1
* | Merge pull request #2848 from arunagw/jruby_activesupport_fixJon Leighton2011-09-041-4/+6
|\ \
| * | We can't simply check the first line of the backtrace, Arun Agrawal2011-09-041-4/+6
* | | Revert "Fixes bug in ActiveRecord::QueryMethods, #1697"Jon Leighton2011-09-042-7/+4
* | | Merge pull request #2841 from wojtekmach/app-generators-groupJosé Valim2011-09-044-1/+61
|\ \ \
| * | | Add gem_group support to generatorsWojciech Mach2011-09-044-1/+61
* | | | Merge pull request #2816 from sikachu/content_tag_forJosé Valim2011-09-044-7/+166
|\ \ \ \ | |_|/ / |/| | |
| * | | Make `content_tag_for` and `div_for` accepts the array of recordsPrem Sichanugrist2011-09-044-7/+166
* | | | Remove useless parensSantiago Pastorino2011-09-041-1/+1
* | | | Merge pull request #2844 from arunagw/warnings_removed_masterSantiago Pastorino2011-09-0312-37/+37
|\ \ \ \
| * | | | Modified content in guides and commentsArun Agrawal2011-09-044-8/+8
| * | | | Warnings removed for "assert_match /" Please doArun Agrawal2011-09-046-25/+25
| * | | | Warnings removed for using shadow variable.Arun Agrawal2011-09-042-4/+4
|/ / / /
* | | | restores the API docs of AR::Fixtures, made a quick pass over them, revises l...Xavier Noria2011-09-033-370/+363
* | | | Merge pull request #2835 from guilleiguaran/actionpack-changelogSantiago Pastorino2011-09-031-2/+2
| |/ / |/| |
* | | Merge pull request #2836 from avakhov/action-controller-helpers-descVijay Dev2011-09-031-3/+6
|\ \ \
| * | | fix helpers behavior descriptionAlexey Vakhov2011-09-031-3/+6
| |/ /
* | | Merge pull request #2825 from guilleiguaran/bcrypt-ruby-commentsAaron Patterson2011-09-032-0/+9
|\ \ \
| * | | Add comments about bcrypt-ruby gem to SecurePasswordGuillermo Iguaran2011-09-031-0/+6
| * | | Add bcrypt-ruby to Gemfile templateGuillermo Iguaran2011-09-031-0/+3
* | | | Merge pull request #2824 from arunagw/bcrypt_fixAaron Patterson2011-09-031-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Need to add here to pass the testArun Agrawal2011-09-031-0/+1
| |/ /
* | | Merge pull request #2827 from sikachu/extractable_ordered_hashJosé Valim2011-09-033-0/+12
|\ \ \ | |/ / |/| |
| * | Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_optio...Prem Sichanugrist2011-09-033-0/+12
* | | fixes CSS example in the asset pipeline guideXavier Noria2011-09-031-1/+1
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-0212-83/+174
|\ \
| * | Revert "Fixing guides validation errors."Vijay Dev2011-09-0210-24/+18
| * | debug option to js, stylesheet tags are ignored when debug mode is offVijay Dev2011-09-021-1/+1
| * | Merge branch 'fix_validation_errors'Andrew Olson2011-09-0210-17/+23
| |\ \
| | * | Fixing guides validation errors.Andrew Olson2011-09-0210-18/+24
| * | | When a collection is empty, render returns nil.Matt Burke2011-09-021-0/+7
| * | | Merge branch 'activemodel_typo_fix'Josh Nesbitt2011-09-021-1/+1
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:46:14 +0000