aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #8705 from amparo-luna/change_update_attributes_to_updateGuillermo Iguaran2013-01-034-8/+8
|\ \ | |/ |/| Rename update_attributes method to update
| * Change docs to use update instead of update_attributesAmparo Luna + Guillermo Iguaran2013-01-034-8/+8
| |
* | Merge pull request #8713 from goshakkk/better-error-pageGuillermo Iguaran2013-01-032-12/+10
|\ \ | | | | | | Fix env toggling, improve error page styling
| * | fix env toggling, improve error page stylingGosha Arinich2013-01-032-12/+10
| | |
* | | Fix typo on form_tag_helper.rbPaulo Luis Franchini Casaretto2013-01-031-1/+1
| | | | | | | | | | | | The inline documentantion had a typo that was somewhat confusing.
* | | Merge pull request #8715 from goshakkk/refactor-mapperCarlos Antonio da Silva2013-01-031-9/+4
|\ \ \ | | | | | | | | Refactor Routing::Mapper#matches?
| * | | refactor Routing::MapperGosha Arinich2013-01-031-9/+4
| |/ /
* | | Explain the possible precautionsAndre Arko2013-01-021-3/+4
| | |
* | | Restore original remote_ip algorithm.Andre Arko2013-01-021-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/undupRafael Mendonça França2013-01-021-5/+3
|\ \ | | | | | | Remove another unnecessary dup
| * | remove another unnecessary dupGosha Arinich2013-01-021-5/+3
| | |
* | | Merge pull request #8701 from senny/8700_double_slash_with_trailing_slashRafael Mendonça França2013-01-021-1/+5
|\ \ \ | | | | | | | | do not append a second slash when using `trailing_slash: true`
| * | | do not append a second slash when usingYves Senn2013-01-021-1/+5
| |/ /
* | | Fixing closing </p>Guillermo Iguaran2013-01-021-1/+1
| | |
* | | Fix a number of validation/style errors:Sam Ruby2013-01-022-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 attributesAaron Patterson2013-01-021-4/+7
| | |
* | | ask the form builder for form tag attributesAaron Patterson2013-01-021-2/+3
| | |
* | | do not mutate the options hash (when we do not need to)Aaron Patterson2013-01-021-2/+2
|/ /
* | Merge pull request #8694 from goshakkk/undupCarlos Antonio da Silva2013-01-021-2/+1
|\ \ | | | | | | Remove unnecessary #dup
| * | remove unnecessary #dupGosha Arinich2013-01-021-2/+1
| |/
* | Merge pull request #8688 from goshakkk/error-page-toggleGuillermo Iguaran2013-01-021-3/+3
|\ \ | |/ |/| Allow toggling dumps on error page
| * allow toggling dumps instead of just showingGosha Arinich2013-01-021-3/+3
| |
* | Cleanup some unnecessary CSS on the new error page and reformat some lines.Lucas Mazza2013-01-021-12/+13
| |
* | add source line paddingGosha Arinich2013-01-021-0/+4
|/
* Make content_tag_for work without blockRafael Mendonça França2013-01-021-1/+5
| | | | This is version of #8640 for master
* remove meaningless AS::FrozenObjectErrorAkira Matsuda2013-01-021-1/+0
|
* Fix indent in UnknownAction templateGuillermo Iguaran2013-01-011-1/+1
|
* Merge pull request #8668 from guilleiguaran/exceptionsDavid Heinemeier Hansson2013-01-0111-64/+257
|\ | | | | 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
| |
| * 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
| |
* | Updated copyright notices for 2013Andrew Nesbitt2012-12-313-3/+3
|/
* Merge pull request #8666 from mekishizufu/fix_lambdasSantiago Pastorino2012-12-311-2/+2
|\ | | | | Fix usage of lambda as a Rack endpoint
| * Fix usage of lambda as a Rack endpointJiri Pospisil2012-12-311-2/+2
| | | | | | | | The response body needs to respond_to? :each.
* | Alias refute methods to assert_not and perfer assert_not on testsRafael Mendonça França2012-12-311-1/+1
| |
* | Inherit from MiniTest::Unit::TestCase instead of MiniTest::SpecRafael Mendonça França2012-12-313-13/+0
|/
* Merge pull request #8662 from ↵Santiago Pastorino2012-12-312-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` responsesYves Senn2012-12-312-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 Pastorino2012-12-301-9/+57
|/ | | | for the non Raw Cookie classes
* Merge pull request #8627 from schneems/schneems/routes-1-9Rafael Mendonça França2012-12-261-1/+1
|\ | | | | Ruby 1.9 style hash in Route Inspector
| * Ruby 1.9 style hash in Route Inspectorschneems2012-12-271-1/+1
| |
* | Extract the component rendering of collection_radio_buttons andRafael Mendonça França2012-12-262-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 ofRafael Mendonça França2012-12-261-1/+2
| | | | | | | | `false`
* | Merge pull request #8598 from NARKOZ/refactor-highlightSantiago Pastorino2012-12-261-2/+2
|\ \ | | | | | | refactor highlight method: return fast if text or phrases are blank
| * | fetch highlighter option only when neededNihad Abbasov2012-12-241-2/+2
| | |
* | | We need to check explictly that env['action_dispatch.show_exceptions']Rafael Mendonça França2012-12-261-1/+1
| | | | | | | | | | | | | | | | | | is false. If it is nil we can't raise the exception