aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8705 from amparo-luna/change_update_attributes_to_updateGuillermo Iguaran2013-01-0338-132/+181
|\ | | | | Rename update_attributes method to update
| * Add Changelog entry regarding update_attibutes being renamed to updateAmparo Luna + Guillermo Iguaran2013-01-031-0/+7
| |
| * Updating default application templates to use update instead of ↵Amparo Luna + Guillermo Iguaran2013-01-034-6/+6
| | | | | | | | update_attributes
| * Change guides to use update instead of update_attributesAmparo Luna + Guillermo Iguaran2013-01-037-19/+19
| |
| * Change docs to use update instead of update_attributesAmparo Luna + Guillermo Iguaran2013-01-038-12/+12
| |
| * Rename update_attributes method to update, keep update_attributes as an aliasAmparo Luna + Guillermo Iguaran2013-01-0319-95/+137
| |
* | Merge pull request #8725 from mattdbridges/patch-2Guillermo Iguaran2013-01-031-1/+1
|\ \ | | | | | | Typo and grammar fixes in the ActionPack CHANGELOG
| * | Typo and grammar fixes in the ActionPack CHANGELOGMatt Bridges2013-01-031-1/+1
|/ /
* | 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
| | |
* | | Merge pull request #8719 from pcasaretto/fix-actionview-doc-typoCarlos Antonio da Silva2013-01-031-1/+1
|\ \ \ | | | | | | | | Fix typo on form_tag_helper.rb [ci skip]
| * | | 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 #8717 from amatsuda/scaffold_controller_test_patchCarlos Antonio da Silva2013-01-033-5/+5
|\ \ \ | | | | | | | | test PATCH method for update action in generated scaffold controller test rather than PUT
| * | | test PATCH method for update action in generated scaffold controller test ↵Akira Matsuda2013-01-033-5/+5
| | | | | | | | | | | | | | | | rather than PUT
* | | | 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
| | |/ / | |/| |
* | | | Merge pull request #8714 from utkarshkukreti/faster-gem-installCarlos Antonio da Silva2013-01-032-5/+5
|\ \ \ \ | |_|/ / |/| | | Pass in `--local` when doing `gem install` for local gems. [ci skip]
| * | | Pass in `--local` when doing `gem install` for local gems.Utkarsh Kukreti2013-01-032-5/+5
|/ / /
* | | Merge pull request #8706 from steveklabnik/ip_precautionsRafael Mendonça França2013-01-021-3/+4
|\ \ \ | | | | | | | | Explain the possible IP precautions
| * | | Explain the possible precautionsAndre Arko2013-01-021-3/+4
|/ / /
* | | Merge pull request #7980 from steveklabnik/issue_7979Guillermo Iguaran2013-01-025-113/+166
|\ \ \ | | | | | | | | Restore original remote_ip algorithm.
| * | | Restore original remote_ip algorithm.Andre Arko2013-01-025-113/+166
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Changelog improvements [ci skip]Carlos Antonio da Silva2013-01-023-4/+5
| | |
* | | missing changelog entry for #8682Akira Matsuda2013-01-021-0/+4
|/ /
* | 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
| | |
* | | CVE-2012-5664 options hashes should only be extracted if there are extra ↵Aaron Patterson2013-01-021-0/+12
| | | | | | | | | | | | | | | | | | | | | parameters Conflicts: activerecord/lib/active_record/dynamic_matchers.rb
* | | Merge pull request #8701 from senny/8700_double_slash_with_trailing_slashRafael Mendonça França2013-01-023-7/+33
|\ \ \ | | | | | | | | do not append a second slash when using `trailing_slash: true`
| * | | do not append a second slash when usingYves Senn2013-01-023-7/+33
| |/ /
* | | Fixing closing </p>Guillermo Iguaran2013-01-021-1/+1
| | |
* | | Merge pull request #8702 from rubys/masterGuillermo Iguaran2013-01-022-8/+7
|\ \ \ | | | | | | | | Fix a number of validation/style errors
| * | | 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-022-3/+7
|\ \ \ | |/ / |/| | Allow toggling dumps on error page
| * | allow toggling dumps instead of just showingGosha Arinich2013-01-022-3/+7
| | |
* | | Merge pull request #8693 from goshakkk/flattenRafael Mendonça França2013-01-021-2/+2
|\ \ \ | |_|/ |/| | Replace #flatten with Array()
| * | replace #flatten with Array()Gosha Arinich2013-01-021-2/+2
| | |
* | | Merge pull request #8692 from lucasmazza/error-page-cssRafael Mendonça França2013-01-021-12/+13
|\ \ \ | | | | | | | | Cleanup the CSS on the new error page.
| * | | 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 preload
| * | 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 code left padding on error pages
| * | | 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
| | | | | | | | This is version of #8640 for master
* | Merge pull request #8686 from mekishizufu/changelog_entryXavier Noria2013-01-021-0/+4
|\ \ | |/ |/| Add missing changelog entry for #8676 [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 16:22:50 +0000