aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
| |\ | | | | | | Fixed typo one line in layouts and rendering: stylesheet_link_tag for file in subdirectory.
| | * Update guides/source/layouts_and_rendering.mdMarek Ovečka2012-12-301-1/+1
| | | | | | | | | | | | | | | Removed first slash. The subdirectory will nto be found with slash befor it.
| * | Improve EnglishRuafozy2013-01-011-5/+7
| | | | | | | | | | | | | | | | | | * Fix one error * Improve wording * Improve punctuation
| * | Add documentation for TimeWithZone methodsMatthew Stopa2012-12-311-3/+19
| | |
| * | Add documentation for the TimeWithZone#dst? method.Matthew Stopa2012-12-311-0/+6
| | | | | | | | | | | | [ci skip]
| * | Update guides/source/rails_on_rack.mdJonathan Baudanza2012-12-301-1/+1
| | | | | | | | | | | | | | | Rack::Lock actually sets rack.multithread to `false`, not `true`. Presumably because once inside the mutex, the app can function as if it were single threaded.
| * | fixed inconsistent `require 'test_helper'` in testing guideJoey Schoblaska2012-12-301-1/+1
| |/
| * Update documentation for yml usageNishant Modak2012-12-301-1/+1
| | | | | | Update documentation for yml usage against https://github.com/rails/rails/issues/8612
| * Document JoinTable migration generatorSammy Larbi2012-12-291-0/+19
| |
* | Merge pull request #8668 from guilleiguaran/exceptionsDavid Heinemeier Hansson2013-01-0112-65/+258
|\ \ | | | | | | New exceptions pages for development
| * | 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 2013
| * | | 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
|/ /
* | Merge pull request #8664 from acapilleri/spawn_methodRafael Mendonça França2012-12-311-8/+10
|\ \ | | | | | | refatctoring of some code repetition in spawn_methods
| * | refatctoring of some code repetition in spawn_methodsAngelo capilleri2012-12-311-8/+10
| | |
* | | Revert "Do not install debugger in the pathlevel 362"Rafael Mendonça França2012-12-311-1/+1
| | | | | | | | | | | | This reverts commit 9c18b6a818801a77a90c2768e436e4690537a3ab.
* | | Use ActiveSupport::TestCase in the journey testsRafael Mendonça França2012-12-3113-13/+13
| | |
* | | Do not install debugger in the pathlevel 362Rafael Mendonça França2012-12-311-1/+1
| | |
* | | Merge pull request #8666 from mekishizufu/fix_lambdasSantiago Pastorino2012-12-313-4/+4
|\ \ \ | | | | | | | | Fix usage of lambda as a Rack endpoint
| * | | Fix usage of lambda as a Rack endpointJiri Pospisil2012-12-313-4/+4
| | | | | | | | | | | | | | | | The response body needs to respond_to? :each.
* | | | Merge branch 'minitest_cleanup'Rafael Mendonça França2012-12-3157-718/+147
|\ \ \ \ | |/ / / |/| | |
| * | | Add note on the contributing guide to not use the refute methodsRafael Mendonça França2012-12-311-2/+3
| | | |
| * | | Alias refute methods to assert_not and perfer assert_not on testsRafael Mendonça França2012-12-3126-67/+76
| | | |
| * | | Do not use the same tests descriptionRafael Mendonça França2012-12-311-3/+3
| | | |
| * | | Remove unneeded testsRafael Mendonça França2012-12-318-584/+0
| | | | | | | | | | | | | | | | These tests are needed only if we are using MiniTest::Spec
| * | | Add active_support/testing/autorunRafael Mendonça França2012-12-3115-14/+20
| | | | | | | | | | | | | | | | | | | | minitest/autorun load minitest/spec polluting the global namespace with the DSL that we don't want on Rails
| * | | Inherit from MiniTest::Unit::TestCase instead of MiniTest::SpecRafael Mendonça França2012-12-316-29/+3
| | | |
| * | | Revert "minitest provides "it" and "describe""Rafael Mendonça França2012-12-312-19/+42
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 22bc12ec374b8bdeb3818ca0a3eb787dd3ce39d8. REASON: We will remove the MiniTest::Spec from Rails and we need these methods again Conflicts: activesupport/lib/active_support/test_case.rb
* | | Merge pull request #8662 from ↵Santiago Pastorino2012-12-314-3/+25
|\ \ \ | |/ / |/| | | | | | | | senny/8661_should_not_append_charset_if_already_present Charset should not be appended to image/* type
| * | charset should not be appended for `head` responsesYves Senn2012-12-314-3/+25
| | | | | | | | | | | | | | | | | | | | | 1) Failure: test_head_created_with_image_png_content_type(RenderTest) [test/controller/render_test.rb:1238]: Expected: "image/png" Actual: "image/png; charset=utf-8"
* | | Define [], []=, permanent, signed and encrypted as the only allowed methods ↵Santiago Pastorino2012-12-301-9/+57
| | | | | | | | | | | | for the non Raw Cookie classes
* | | Merge pull request #8546 from hsbt/fix-testcase-strict-warningSantiago Pastorino2012-12-301-1/+2
|\ \ \ | |/ / |/| | fix testcase: ruby-2.0.0 warned unused variables
| * | change spy of after invoked controller action. because ruby-2.0.0 waned ↵SHIBATA Hiroshi2012-12-201-1/+2
| | | | | | | | | | | | unused variables
* | | Revert "Rails 4.0 is going to depend on Rack 1.5.x so let's test against ↵Guillermo Iguaran2012-12-301-1/+0
| | | | | | | | | | | | | | | | | | Rack master" This reverts commit fba97c9620e709f0449ea9f3240b9e5174f72e1e.
* | | Point to guides.rubyonrails.org instead of edgeguides.rubyonrails.orgSantiago Pastorino2012-12-301-2/+2
| | |
* | | Merge pull request #8651 from tjouan/activerecord-structure_dump-ending_nlRafael Mendonça França2012-12-301-1/+3
|\ \ \ | | | | | | | | Fix missing ending newline in db structure dump:
| * | | Fix missing ending newline in db structure dump:Thibault Jouan2012-12-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dumping database structure with `rake db:structure:dump` and using migrations, the resulting file will not end with a newline char. Although it's not mandatory, it breaks a lot of simple use cases with programs like cat, more, grep, etc. This changes use `puts' instead of `<<' to append migration versions data to the dump and also split the line where this is happening as it was a bit long.
* | | | Improve secret_token deprecation messageSantiago Pastorino2012-12-301-3/+4
|/ / /