aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8692 from lucasmazza/error-page-cssRafael Mendonça França2013-01-021-12/+13
|\
| * Cleanup some unnecessary CSS on the new error page and reformat some lines.Lucas Mazza2013-01-021-12/+13
* | Merge pull request #8691 from acapilleri/preload_associationRafael Mendonça França2013-01-021-1/+3
|\ \ | |/ |/|
| * refactoring to_sym of Symbol in preloadAngelo capilleri2013-01-021-1/+3
* | Merge pull request #8689 from goshakkk/error-pageRafael Mendonça França2013-01-021-0/+4
|\ \
| * | add source line paddingGosha Arinich2013-01-021-0/+4
* | | No need to pass a empty block to content_tag_for anymoreRafael Mendonça França2013-01-021-11/+11
|/ /
* | Make content_tag_for work without blockRafael Mendonça França2013-01-023-1/+17
* | Merge pull request #8686 from mekishizufu/changelog_entryXavier Noria2013-01-021-0/+4
|\ \ | |/ |/|
| * Add missing changelog entry for #8676 [ci skip]Jiri Pospisil2013-01-021-0/+4
|/
* Merge pull request #8682 from amatsuda/rm_as_frozen_object_errorGuillermo Iguaran2013-01-017-12/+4
|\
| * remove meaningless AS::FrozenObjectErrorAkira Matsuda2013-01-027-12/+4
* | Standardize the use of current_adapter?Rafael Mendonça França2013-01-019-19/+19
* | Merge pull request #8678 from yahonda/remove_column_oracleRafael Mendonça França2013-01-011-2/+3
|\ \
| * | Address a failure test_remove_column_with_multi_column_index with Oracle data...Yasuo Honda2013-01-021-2/+3
| |/
* | Merge pull request #8677 from amatsuda/unused_scope_in_test_modelsRafael Mendonça França2013-01-011-2/+0
|\ \ | |/ |/|
| * unused scopeAkira Matsuda2013-01-021-2/+0
|/
* Add entry in Releases Notes about changes in exceptions pageGuillermo Iguaran2013-01-011-0/+2
* Add CHANGELOG entry for changes in exception pagesGuillermo Iguaran2013-01-011-0/+6
* update rake tasks output [ci skip]Vijay Dev2013-01-011-1/+1
* fix alignment in rails info properties page [ci skip]Vijay Dev2013-01-011-0/+2
* Merge pull request #8676 from mekishizufu/skip_bundle_aliasJosé Valim2013-01-011-1/+1
|\
| * Add -B alias for --skip-bundleJiri Pospisil2013-01-011-1/+1
|/
* Merge pull request #8675 from goshakkk/cleanupJosé Valim2013-01-011-1/+1
|\
| * remove unnecessary always-nil var from #compactGosha Arinich2013-01-011-1/+1
|/
* small fix in js guide [ci skip]Vijay Dev2013-01-011-1/+1
* Fix indent in UnknownAction templateGuillermo Iguaran2013-01-011-1/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-01-016-8/+50
|\
| * copy edits [ci skip]Vijay Dev2013-01-011-4/+3
| * Merge pull request #123 from m-o/masterVijay Dev2013-01-011-1/+1
| |\
| | * Update guides/source/layouts_and_rendering.mdMarek Ovečka2012-12-301-1/+1
| * | Improve EnglishRuafozy2013-01-011-5/+7
| * | Add documentation for TimeWithZone methodsMatthew Stopa2012-12-311-3/+19
| * | Add documentation for the TimeWithZone#dst? method.Matthew Stopa2012-12-311-0/+6
| * | Update guides/source/rails_on_rack.mdJonathan Baudanza2012-12-301-1/+1
| * | fixed inconsistent `require 'test_helper'` in testing guideJoey Schoblaska2012-12-301-1/+1
| |/
| * Update documentation for yml usageNishant Modak2012-12-301-1/+1
| * Document JoinTable migration generatorSammy Larbi2012-12-291-0/+19
* | Merge pull request #8668 from guilleiguaran/exceptionsDavid Heinemeier Hansson2013-01-0112-65/+258
|\ \
| * | formatted_code_for should be privateGuillermo Iguaran2012-12-311-12/+12
| * | Summary and Details HTML elements aren't supported in all modern browsersGuillermo Iguaran2012-12-312-12/+12
| * | Fix test for DebugExceptions due to template changeGuillermo Iguaran2012-12-311-1/+1
| * | Add style to AV::Template::Error exception pageGuillermo Iguaran2012-12-313-18/+54
| * | Improve line-height to have better line spacing in exception messageGuillermo Iguaran2012-12-311-0/+1
| * | Add new style to Routing Error pageGuillermo Iguaran2012-12-311-19/+22
| * | Styling for exception pageGuillermo Iguaran2012-12-316-29/+150
| * | Add source extract to detailed exception pageGuillermo Iguaran2012-12-314-2/+34
* | | Merge pull request #8667 from andrew/copyright-updateJeremy Kemper2012-12-3113-13/+13
|\ \ \
| * | | Updated copyright notices for 2013Andrew Nesbitt2012-12-3113-13/+13
|/ / /
* / / Only call MiniTest.autorun if the dependecy is presentRafael Mendonça França2012-12-314-16/+12
|/ /