Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8676 from mekishizufu/skip_bundle_alias | José Valim | 2013-01-01 | 1 | -1/+1 |
|\ | | | | | Add -B alias for --skip-bundle | ||||
| * | Add -B alias for --skip-bundle | Jiri Pospisil | 2013-01-01 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #8675 from goshakkk/cleanup | José Valim | 2013-01-01 | 1 | -1/+1 |
|\ | | | | | Remove unnecessary always-nil var from #compact | ||||
| * | remove unnecessary always-nil var from #compact | Gosha Arinich | 2013-01-01 | 1 | -1/+1 |
|/ | |||||
* | small fix in js guide [ci skip] | Vijay Dev | 2013-01-01 | 1 | -1/+1 |
| | |||||
* | Fix indent in UnknownAction template | Guillermo Iguaran | 2013-01-01 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-01-01 | 6 | -8/+50 |
|\ | |||||
| * | copy edits [ci skip] | Vijay Dev | 2013-01-01 | 1 | -4/+3 |
| | | |||||
| * | Merge pull request #123 from m-o/master | Vijay Dev | 2013-01-01 | 1 | -1/+1 |
| |\ | | | | | | | Fixed typo one line in layouts and rendering: stylesheet_link_tag for file in subdirectory. | ||||
| | * | Update guides/source/layouts_and_rendering.md | Marek Ovečka | 2012-12-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Removed first slash. The subdirectory will nto be found with slash befor it. | ||||
| * | | Improve English | Ruafozy | 2013-01-01 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | * Fix one error * Improve wording * Improve punctuation | ||||
| * | | Add documentation for TimeWithZone methods | Matthew Stopa | 2012-12-31 | 1 | -3/+19 |
| | | | |||||
| * | | Add documentation for the TimeWithZone#dst? method. | Matthew Stopa | 2012-12-31 | 1 | -0/+6 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | Update guides/source/rails_on_rack.md | Jonathan Baudanza | 2012-12-30 | 1 | -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 guide | Joey Schoblaska | 2012-12-30 | 1 | -1/+1 |
| |/ | |||||
| * | Update documentation for yml usage | Nishant Modak | 2012-12-30 | 1 | -1/+1 |
| | | | | | | Update documentation for yml usage against https://github.com/rails/rails/issues/8612 | ||||
| * | Document JoinTable migration generator | Sammy Larbi | 2012-12-29 | 1 | -0/+19 |
| | | |||||
* | | Merge pull request #8668 from guilleiguaran/exceptions | David Heinemeier Hansson | 2013-01-01 | 12 | -65/+258 |
|\ \ | | | | | | | New exceptions pages for development | ||||
| * | | formatted_code_for should be private | Guillermo Iguaran | 2012-12-31 | 1 | -12/+12 |
| | | | |||||
| * | | Summary and Details HTML elements aren't supported in all modern browsers | Guillermo Iguaran | 2012-12-31 | 2 | -12/+12 |
| | | | |||||
| * | | Fix test for DebugExceptions due to template change | Guillermo Iguaran | 2012-12-31 | 1 | -1/+1 |
| | | | |||||
| * | | Add style to AV::Template::Error exception page | Guillermo Iguaran | 2012-12-31 | 3 | -18/+54 |
| | | | |||||
| * | | Improve line-height to have better line spacing in exception message | Guillermo Iguaran | 2012-12-31 | 1 | -0/+1 |
| | | | |||||
| * | | Add new style to Routing Error page | Guillermo Iguaran | 2012-12-31 | 1 | -19/+22 |
| | | | |||||
| * | | Styling for exception page | Guillermo Iguaran | 2012-12-31 | 6 | -29/+150 |
| | | | |||||
| * | | Add source extract to detailed exception page | Guillermo Iguaran | 2012-12-31 | 4 | -2/+34 |
| | | | |||||
* | | | Merge pull request #8667 from andrew/copyright-update | Jeremy Kemper | 2012-12-31 | 13 | -13/+13 |
|\ \ \ | | | | | | | | | Updated copyright notices for 2013 | ||||
| * | | | Updated copyright notices for 2013 | Andrew Nesbitt | 2012-12-31 | 13 | -13/+13 |
|/ / / | |||||
* / / | Only call MiniTest.autorun if the dependecy is present | Rafael Mendonça França | 2012-12-31 | 4 | -16/+12 |
|/ / | |||||
* | | Merge pull request #8664 from acapilleri/spawn_method | Rafael Mendonça França | 2012-12-31 | 1 | -8/+10 |
|\ \ | | | | | | | refatctoring of some code repetition in spawn_methods | ||||
| * | | refatctoring of some code repetition in spawn_methods | Angelo capilleri | 2012-12-31 | 1 | -8/+10 |
| | | | |||||
* | | | Revert "Do not install debugger in the pathlevel 362" | Rafael Mendonça França | 2012-12-31 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 9c18b6a818801a77a90c2768e436e4690537a3ab. | ||||
* | | | Use ActiveSupport::TestCase in the journey tests | Rafael Mendonça França | 2012-12-31 | 13 | -13/+13 |
| | | | |||||
* | | | Do not install debugger in the pathlevel 362 | Rafael Mendonça França | 2012-12-31 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #8666 from mekishizufu/fix_lambdas | Santiago Pastorino | 2012-12-31 | 3 | -4/+4 |
|\ \ \ | | | | | | | | | Fix usage of lambda as a Rack endpoint | ||||
| * | | | Fix usage of lambda as a Rack endpoint | Jiri Pospisil | 2012-12-31 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | | The response body needs to respond_to? :each. | ||||
* | | | | Merge branch 'minitest_cleanup' | Rafael Mendonça França | 2012-12-31 | 57 | -718/+147 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Add note on the contributing guide to not use the refute methods | Rafael Mendonça França | 2012-12-31 | 1 | -2/+3 |
| | | | | |||||
| * | | | Alias refute methods to assert_not and perfer assert_not on tests | Rafael Mendonça França | 2012-12-31 | 26 | -67/+76 |
| | | | | |||||
| * | | | Do not use the same tests description | Rafael Mendonça França | 2012-12-31 | 1 | -3/+3 |
| | | | | |||||
| * | | | Remove unneeded tests | Rafael Mendonça França | 2012-12-31 | 8 | -584/+0 |
| | | | | | | | | | | | | | | | | These tests are needed only if we are using MiniTest::Spec | ||||
| * | | | Add active_support/testing/autorun | Rafael Mendonça França | 2012-12-31 | 15 | -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::Spec | Rafael Mendonça França | 2012-12-31 | 6 | -29/+3 |
| | | | | |||||
| * | | | Revert "minitest provides "it" and "describe"" | Rafael Mendonça França | 2012-12-31 | 2 | -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 Pastorino | 2012-12-31 | 4 | -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` responses | Yves Senn | 2012-12-31 | 4 | -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 Pastorino | 2012-12-30 | 1 | -9/+57 |
| | | | | | | | | | | | | for the non Raw Cookie classes | ||||
* | | | Merge pull request #8546 from hsbt/fix-testcase-strict-warning | Santiago Pastorino | 2012-12-30 | 1 | -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 Hiroshi | 2012-12-20 | 1 | -1/+2 |
| | | | | | | | | | | | | unused variables | ||||
* | | | Revert "Rails 4.0 is going to depend on Rack 1.5.x so let's test against ↵ | Guillermo Iguaran | 2012-12-30 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | Rack master" This reverts commit fba97c9620e709f0449ea9f3240b9e5174f72e1e. |