Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8713 from goshakkk/better-error-page | Guillermo Iguaran | 2013-01-03 | 2 | -12/+10 |
|\ | | | | | Fix env toggling, improve error page styling | ||||
| * | fix env toggling, improve error page styling | Gosha Arinich | 2013-01-03 | 2 | -12/+10 |
| | | |||||
* | | Fix typo on form_tag_helper.rb | Paulo Luis Franchini Casaretto | 2013-01-03 | 1 | -1/+1 |
| | | | | | | | | The inline documentantion had a typo that was somewhat confusing. | ||||
* | | Merge pull request #8715 from goshakkk/refactor-mapper | Carlos Antonio da Silva | 2013-01-03 | 1 | -9/+4 |
|\ \ | | | | | | | Refactor Routing::Mapper#matches? | ||||
| * | | refactor Routing::Mapper | Gosha Arinich | 2013-01-03 | 1 | -9/+4 |
| |/ | |||||
* | | Explain the possible precautions | Andre Arko | 2013-01-02 | 1 | -3/+4 |
| | | |||||
* | | Restore original remote_ip algorithm. | Andre Arko | 2013-01-02 | 1 | -53/+112 |
|/ | | | | | | | | | | | Proxy servers add X-Forwarded-For headers, resulting in a list of IPs. We remove trusted IP values, and then take the last given value, assuming that it is the most likely to be the correct, unfaked value. See [1] for a very thorough discussion of why that is the best option we have at the moment. [1]: http://blog.gingerlime.com/2012/rails-ip-spoofing-vulnerabilities-and-protection/ Fixes #7979 | ||||
* | Merge pull request #8697 from goshakkk/undup | Rafael Mendonça França | 2013-01-02 | 1 | -5/+3 |
|\ | | | | | Remove another unnecessary dup | ||||
| * | remove another unnecessary dup | Gosha Arinich | 2013-01-02 | 1 | -5/+3 |
| | | |||||
* | | Merge pull request #8701 from senny/8700_double_slash_with_trailing_slash | Rafael Mendonça França | 2013-01-02 | 1 | -1/+5 |
|\ \ | | | | | | | do not append a second slash when using `trailing_slash: true` | ||||
| * | | do not append a second slash when using | Yves Senn | 2013-01-02 | 1 | -1/+5 |
| |/ | |||||
* | | Fixing closing </p> | Guillermo Iguaran | 2013-01-02 | 1 | -1/+1 |
| | | |||||
* | | Fix a number of validation/style errors: | Sam Ruby | 2013-01-02 | 2 | -8/+7 |
| | | | | | | | | | | | | | | | | | | | | * <pre> is not allowed to be nested inside of <p> elements in HTML * Indentation of </p> doesn't match corresponding <p> * <p> element not explicitly closed * One more </div> than <div> In each case, the template was fixed to match how a HTML5 parser would "see" the resulting page. | ||||
* | | take into account multipart when calculating tag attributes | Aaron Patterson | 2013-01-02 | 1 | -4/+7 |
| | | |||||
* | | ask the form builder for form tag attributes | Aaron Patterson | 2013-01-02 | 1 | -2/+3 |
| | | |||||
* | | do not mutate the options hash (when we do not need to) | Aaron Patterson | 2013-01-02 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #8694 from goshakkk/undup | Carlos Antonio da Silva | 2013-01-02 | 1 | -2/+1 |
|\ | | | | | Remove unnecessary #dup | ||||
| * | remove unnecessary #dup | Gosha Arinich | 2013-01-02 | 1 | -2/+1 |
| | | |||||
* | | Merge pull request #8688 from goshakkk/error-page-toggle | Guillermo Iguaran | 2013-01-02 | 1 | -3/+3 |
|\ \ | |/ |/| | Allow toggling dumps on error page | ||||
| * | allow toggling dumps instead of just showing | Gosha Arinich | 2013-01-02 | 1 | -3/+3 |
| | | |||||
* | | Cleanup some unnecessary CSS on the new error page and reformat some lines. | Lucas Mazza | 2013-01-02 | 1 | -12/+13 |
| | | |||||
* | | add source line padding | Gosha Arinich | 2013-01-02 | 1 | -0/+4 |
|/ | |||||
* | Make content_tag_for work without block | Rafael Mendonça França | 2013-01-02 | 1 | -1/+5 |
| | | | | This is version of #8640 for master | ||||
* | remove meaningless AS::FrozenObjectError | Akira Matsuda | 2013-01-02 | 1 | -1/+0 |
| | |||||
* | Fix indent in UnknownAction template | Guillermo Iguaran | 2013-01-01 | 1 | -1/+1 |
| | |||||
* | Merge pull request #8668 from guilleiguaran/exceptions | David Heinemeier Hansson | 2013-01-01 | 11 | -64/+257 |
|\ | | | | | 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 |
| | | |||||
| * | 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 |
| | | |||||
* | | Updated copyright notices for 2013 | Andrew Nesbitt | 2012-12-31 | 3 | -3/+3 |
|/ | |||||
* | Merge pull request #8666 from mekishizufu/fix_lambdas | Santiago Pastorino | 2012-12-31 | 1 | -2/+2 |
|\ | | | | | Fix usage of lambda as a Rack endpoint | ||||
| * | Fix usage of lambda as a Rack endpoint | Jiri Pospisil | 2012-12-31 | 1 | -2/+2 |
| | | | | | | | | The response body needs to respond_to? :each. | ||||
* | | Alias refute methods to assert_not and perfer assert_not on tests | Rafael Mendonça França | 2012-12-31 | 1 | -1/+1 |
| | | |||||
* | | Inherit from MiniTest::Unit::TestCase instead of MiniTest::Spec | Rafael Mendonça França | 2012-12-31 | 3 | -13/+0 |
|/ | |||||
* | Merge pull request #8662 from ↵ | Santiago Pastorino | 2012-12-31 | 2 | -2/+7 |
|\ | | | | | | | | | 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 | 2 | -2/+7 |
| | | | | | | | | | | | | | | 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 #8627 from schneems/schneems/routes-1-9 | Rafael Mendonça França | 2012-12-26 | 1 | -1/+1 |
|\ | | | | | Ruby 1.9 style hash in Route Inspector | ||||
| * | Ruby 1.9 style hash in Route Inspector | schneems | 2012-12-27 | 1 | -1/+1 |
| | | |||||
* | | Extract the component rendering of collection_radio_buttons and | Rafael Mendonça França | 2012-12-26 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collection_check_boxes to a private method. It will make easier to extend. Example: class CollectionRadioButtons < ActionView::Helpers::Tags::CollectionRadioButtons include CollectionExtensions def render wrap_rendered_collection(super, @options) end private def render_component(builder) builder.radio_button + builder.label(:class => "collection_radio_buttons") end end | ||||
* | | Fix collection_radio_buttons with the option `:checked` with value of | Rafael Mendonça França | 2012-12-26 | 1 | -1/+2 |
| | | | | | | | | `false` | ||||
* | | Merge pull request #8598 from NARKOZ/refactor-highlight | Santiago Pastorino | 2012-12-26 | 1 | -2/+2 |
|\ \ | | | | | | | refactor highlight method: return fast if text or phrases are blank | ||||
| * | | fetch highlighter option only when needed | Nihad Abbasov | 2012-12-24 | 1 | -2/+2 |
| | | | |||||
* | | | We need to check explictly that env['action_dispatch.show_exceptions'] | Rafael Mendonça França | 2012-12-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | is false. If it is nil we can't raise the exception | ||||
* | | | more descriptive return parameters | Hrvoje Šimić | 2012-12-26 | 1 | -4/+3 |
|/ / | |||||
* | | "warning: ambiguous first argument; put parentheses or even spaces" | Akira Matsuda | 2012-12-24 | 1 | -1/+1 |
| | |