aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #2861 from guilleiguaran/assets-fix-changelogSantiago Pastorino2011-09-041-0/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Add entry about Asset behaviour fix to ActionPack ChangeLog
| * | | | | | | | Add entry about Asset behaviour fix to ActionPack ChangeLogGuillermo Iguaran2011-09-041-0/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #2860 from guilleiguaran/fix-assets-behaviorSantiago Pastorino2011-09-042-2/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix AssetNotPrecompiledError behavior
| * | | | | | | | AssetNotPrecompiledError should be raise when config.assets.digest = false, ↵Guillermo Iguaran2011-09-042-2/+28
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | config.assets.compile = false and manifest file isn't present
* | | | | | | | * 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.
| * | | | | | | We need to recorder here. Need to drop the order from default scope.Arun Agrawal2011-09-053-1/+31
|/ / / / / / / | | | | | | | | | | | | | | Fixes #2832
* | | | | | | Merge pull request #2852 from milandobrota/remove_unneeded_explicit_nil_checksJon Leighton2011-09-047-11/+11
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | if ... nil? is more expensive than unless
| * | | | | | 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 block
| | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and remove info about x_send_file option to send_file
| * | | | | | fix YUI descriptionRichard Hulse2011-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | YUI CSS compressor does not extend syntax! Also added link to more info
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Is more "correct" a complete url than only the path
* | | | | | | Merge pull request #2848 from arunagw/jruby_activesupport_fixJon Leighton2011-09-041-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Need to have a check here for JAVA PLATFORM for JRuby
| * | | | | | | We can't simply check the first line of the backtrace, Arun Agrawal2011-09-041-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | because JRuby reports the call to __send__ in the backtrace.
* | | | | | | | Revert "Fixes bug in ActiveRecord::QueryMethods, #1697"Jon Leighton2011-09-042-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0df27c98d982ec87d2fb48cfda82694eb267993e. Reverted due to failing test, see #2845.
* | | | | | | | Merge pull request #2841 from wojtekmach/app-generators-groupJosé Valim2011-09-044-1/+61
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add gem group support to generators
| * | | | | | | | 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 records
| * | | | | | | | Make `content_tag_for` and `div_for` accepts the array of recordsPrem Sichanugrist2011-09-044-7/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So instead of having to do this: @items.each do |item| content_tag_for(:li, item) do Title: <%= item.title %> end end You can now do this: content_tag_for(:li, @items) do |item| Title: <%= item.title %> end
* | | | | | | | | Remove useless parensSantiago Pastorino2011-09-041-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #2844 from arunagw/warnings_removed_masterSantiago Pastorino2011-09-0312-37/+37
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Warnings removed from master
| * | | | | | | | | Modified content in guides and commentsArun Agrawal2011-09-044-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for "assert /" warnings. Removed because if somebody will use this code they will get warnings!
| * | | | | | | | | Warnings removed for "assert_match /" Please doArun Agrawal2011-09-046-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not add more.!
| * | | | | | | | | 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 ↵Xavier Noria2011-09-033-370/+363
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | link in fixture template [closes #2840]
* | | | | | | | | Merge pull request #2835 from guilleiguaran/actionpack-changelogSantiago Pastorino2011-09-031-2/+2
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Include ticket numbers in AP CHANGELOG
* | | | | | | | Merge pull request #2836 from avakhov/action-controller-helpers-descVijay Dev2011-09-031-3/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix helpers behavior description
| * | | | | | | | 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 SecurePassword and add it to default Gemfile
| * | | | | | | | 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 test
| * | | | | | | | Need to add here to pass the testArun Agrawal2011-09-031-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | As in previous commit it's removed.
* | | | | | | | Merge pull request #2827 from sikachu/extractable_ordered_hashJosé Valim2011-09-033-0/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options!
| * | | | | | | Make `ActiveSupport::OrderedHash` extractable when using ↵Prem Sichanugrist2011-09-033-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Array#extract_options!` `ActiveSupport::OrderedHash` is actually a subclass of the hash, so it does make sense that it should be extractable from the array list.
* | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d20281add192e5afba66e555ce67cf73943b033b. Reason: This needs more investigation. Will apply when this is verified.
| * | | | | | | 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
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 07:27:06 +0000