aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't find belongs_to target when the foreign_key is NULL. Fixes #2828Georg Friedrich2011-09-052-0/+10
|
* Merge pull request #2873 from guilleiguaran/remove-unused-configSantiago Pastorino2011-09-051-3/+0
|\ | | | | Remove unused config variable from test.rb template
| * Remove unused config variable from test.rb templateGuillermo Iguaran2011-09-051-3/+0
| |
* | Merge pull request #2872 from sikachu/content_tag_html_safeSantiago Pastorino2011-09-052-1/+13
|\ \ | | | | | | Make sure that result from content_tag_for with collection is html_safe
| * | Make sure that result from content_tag_for with collection is html_safePrem Sichanugrist2011-09-052-1/+13
| | | | | | | | | Thank you @spastorino for catching the empty test in b84cee0, as I totally forgot that I still have to make it html_safe.
* | | Merge pull request #2815 from avakhov/current-page-non-get-requestsSantiago Pastorino2011-09-052-2/+16
|\ \ \ | | | | | | | | current_page? returns false for non-GET requests
| * | | current_page? returns false for non-GET requestsAlexey Vakhov2011-09-022-2/+16
| | | |
* | | | Merge pull request #2799 from tomstuart/3-1-stableSantiago Pastorino2011-09-052-3/+39
| | | | | | | | | | | | | | | | Never return stored content from content_for when a block is given
* | | | Merge pull request #2789 from dmathieu/limit_first_lastJon Leighton2011-09-052-2/+32
|\ \ \ \ | | | | | | | | | | Use LIMIT SQL word in first - Closes #2783
| * | | | Use LIMIT sql word in last when it's possibleDamien Mathieu2011-09-052-2/+23
| | | | |
| * | | | use LIMIT SQL word in first - Closes #2783Damien Mathieu2011-09-052-1/+10
|/ / / /
* | / / add blanks between methodsVijay Dev2011-09-051-0/+3
| |/ / |/| |
* | | Merge pull request #2868 from arunagw/batches_test_pg_masterJon Leighton2011-09-051-1/+1
|\ \ \ | | | | | | | | Sort here to make sure the order is ok.
| * | | Sort here to make sure the order is ok.Arun Agrawal2011-09-051-1/+1
|/ / /
* | | Merge pull request #2713 from FLOChip/500-fixedJosé Valim2011-09-051-1/+0
|\ \ \ | | | | | | | | remove misleading line on 500 error page. #2648
| * | | remove misleading line on 500 error page.Teng Siong Ong2011-08-271-1/+0
| | | |
| * | | fixed 500 error message which is misleading by suggesting all rails apps ↵Jared Tame2011-08-271-1/+1
| | | | | | | | | | | | | | | | have exception notifications by default
* | | | Remove empty testSantiago Pastorino2011-09-051-3/+0
| | | |
* | | | Merge pull request #2863 from ↵Santiago Pastorino2011-09-041-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | raybaxter/silence_unitialized_instance_variable_warnings Silence unitialized instance variable warnings
| * | | | Tests shouldn't produce warningsRay Baxter2011-09-041-0/+5
| | | | |
* | | | | 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!
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-24 23:37:26 +0000