aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Disable active record marshalling tests on Ruby 1.8.7 on Travis CI, as they ↵Jon Leighton2011-09-062-0/+25
| | | | have been failing intermittently for a long while due to what appears to be a Ruby bug. If anyone has the skills/expertise/time to debug this, please speak to the Travis guys.
* Merge pull request #2883 from dmathieu/fix_testJon Leighton2011-09-061-1/+1
|\ | | | | #first doesn't take an order in this test
| * #first doesn't take an order in this testDamien Mathieu2011-09-061-1/+1
| |
* | Merge pull request #2851 from dasch/patch-6Jon Leighton2011-09-061-5/+3
|\ \ | |/ |/| No need to use a begin block there
| * No need to use a begin block thereDaniel Schierbeck2011-09-041-5/+3
| |
* | Bump uglifier upSantiago Pastorino2011-09-051-1/+1
| |
* | Merge pull request #2870 from arunagw/uglifier_bumpSantiago Pastorino2011-09-051-1/+1
|\ \ | | | | | | Uglifier bump
| * | Uglifier bumpArun Agrawal2011-09-051-1/+1
| | |
* | | Merge pull request #2877 from dmathieu/fix_tests_pg_18Santiago Pastorino2011-09-051-2/+2
|\ \ \ | | | | | | | | Last orders the records by id
| * | | first and last orders the records by idDamien Mathieu2011-09-061-2/+2
| | | |
* | | | Merge pull request #2716 from jbbarth/fix_invert_rename_indexAaron Patterson2011-09-052-3/+3
|\ \ \ \ | | | | | | | | | | Fix bad options order in AR::Migration::CommandRecorder#invert_rename_index
| * | | | Fixed bad options order in ↵jbbarth2011-08-282-3/+3
| | | | | | | | | | | | | | | | | | | | ActiveRecord::Migration::CommandRecorder#invert_rename_index
* | | | | 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-19 10:02:25 +0000