Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Change guides to use update instead of update_attributes | Amparo Luna + Guillermo Iguaran | 2013-01-03 | 7 | -19/+19 | |
| | | | | ||||||
| * | | | Change docs to use update instead of update_attributes | Amparo Luna + Guillermo Iguaran | 2013-01-03 | 8 | -12/+12 | |
| | | | | ||||||
| * | | | Rename update_attributes method to update, keep update_attributes as an alias | Amparo Luna + Guillermo Iguaran | 2013-01-03 | 19 | -95/+137 | |
| | | | | ||||||
* | | | | Merge pull request #8725 from mattdbridges/patch-2 | Guillermo Iguaran | 2013-01-03 | 1 | -1/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | Typo and grammar fixes in the ActionPack CHANGELOG | |||||
| * | | | Typo and grammar fixes in the ActionPack CHANGELOG | Matt Bridges | 2013-01-03 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | 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 | |
| | | | | ||||||
* | | | | Merge pull request #8719 from pcasaretto/fix-actionview-doc-typo | Carlos Antonio da Silva | 2013-01-03 | 1 | -1/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | Fix typo on form_tag_helper.rb [ci skip] | |||||
| * | | | 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 #8717 from amatsuda/scaffold_controller_test_patch | Carlos Antonio da Silva | 2013-01-03 | 3 | -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 Matsuda | 2013-01-03 | 3 | -5/+5 | |
| | | | | | | | | | | | | | | | | rather than PUT | |||||
* | | | | 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 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #8714 from utkarshkukreti/faster-gem-install | Carlos Antonio da Silva | 2013-01-03 | 2 | -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 Kukreti | 2013-01-03 | 2 | -5/+5 | |
|/ / / | ||||||
* | | | Merge pull request #8706 from steveklabnik/ip_precautions | Rafael Mendonça França | 2013-01-02 | 1 | -3/+4 | |
|\ \ \ | | | | | | | | | Explain the possible IP precautions | |||||
| * | | | Explain the possible precautions | Andre Arko | 2013-01-02 | 1 | -3/+4 | |
|/ / / | ||||||
* | | | Merge pull request #7980 from steveklabnik/issue_7979 | Guillermo Iguaran | 2013-01-02 | 5 | -113/+166 | |
|\ \ \ | | | | | | | | | Restore original remote_ip algorithm. | |||||
| * | | | Restore original remote_ip algorithm. | Andre Arko | 2013-01-02 | 5 | -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 Silva | 2013-01-02 | 3 | -4/+5 | |
| | | | ||||||
* | | | missing changelog entry for #8682 | Akira Matsuda | 2013-01-02 | 1 | -0/+4 | |
|/ / | ||||||
* | | 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 | |
| | | | ||||||
* | | | CVE-2012-5664 options hashes should only be extracted if there are extra ↵ | Aaron Patterson | 2013-01-02 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | parameters Conflicts: activerecord/lib/active_record/dynamic_matchers.rb | |||||
* | | | Merge pull request #8701 from senny/8700_double_slash_with_trailing_slash | Rafael Mendonça França | 2013-01-02 | 3 | -7/+33 | |
|\ \ \ | | | | | | | | | do not append a second slash when using `trailing_slash: true` | |||||
| * | | | do not append a second slash when using | Yves Senn | 2013-01-02 | 3 | -7/+33 | |
| |/ / | ||||||
* | | | Fixing closing </p> | Guillermo Iguaran | 2013-01-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #8702 from rubys/master | Guillermo Iguaran | 2013-01-02 | 2 | -8/+7 | |
|\ \ \ | | | | | | | | | Fix a number of validation/style errors | |||||
| * | | | 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 | 2 | -3/+7 | |
|\ \ \ | |/ / |/| | | Allow toggling dumps on error page | |||||
| * | | allow toggling dumps instead of just showing | Gosha Arinich | 2013-01-02 | 2 | -3/+7 | |
| | | | ||||||
* | | | Merge pull request #8693 from goshakkk/flatten | Rafael Mendonça França | 2013-01-02 | 1 | -2/+2 | |
|\ \ \ | |_|/ |/| | | Replace #flatten with Array() | |||||
| * | | replace #flatten with Array() | Gosha Arinich | 2013-01-02 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #8692 from lucasmazza/error-page-css | Rafael Mendonça França | 2013-01-02 | 1 | -12/+13 | |
|\ \ \ | | | | | | | | | Cleanup the CSS on the new error page. | |||||
| * | | | Cleanup some unnecessary CSS on the new error page and reformat some lines. | Lucas Mazza | 2013-01-02 | 1 | -12/+13 | |
| |/ / | ||||||
* | | | Merge pull request #8691 from acapilleri/preload_association | Rafael Mendonça França | 2013-01-02 | 1 | -1/+3 | |
|\ \ \ | |/ / |/| | | refactoring to_sym of Symbol in preload | |||||
| * | | refactoring to_sym of Symbol in preload | Angelo capilleri | 2013-01-02 | 1 | -1/+3 | |
| | | | ||||||
* | | | Merge pull request #8689 from goshakkk/error-page | Rafael Mendonça França | 2013-01-02 | 1 | -0/+4 | |
|\ \ \ | | | | | | | | | Add source code left padding on error pages | |||||
| * | | | add source line padding | Gosha Arinich | 2013-01-02 | 1 | -0/+4 | |
| | |/ | |/| | ||||||
* / | | No need to pass a empty block to content_tag_for anymore | Rafael Mendonça França | 2013-01-02 | 1 | -11/+11 | |
|/ / | ||||||
* | | Make content_tag_for work without block | Rafael Mendonça França | 2013-01-02 | 3 | -1/+17 | |
| | | | | | | | | This is version of #8640 for master | |||||
* | | Merge pull request #8686 from mekishizufu/changelog_entry | Xavier Noria | 2013-01-02 | 1 | -0/+4 | |
|\ \ | |/ |/| | Add missing changelog entry for #8676 [ci skip] | |||||
| * | Add missing changelog entry for #8676 [ci skip] | Jiri Pospisil | 2013-01-02 | 1 | -0/+4 | |
|/ | ||||||
* | Merge pull request #8682 from amatsuda/rm_as_frozen_object_error | Guillermo Iguaran | 2013-01-01 | 7 | -12/+4 | |
|\ | | | | | remove meaningless AS::FrozenObjectError | |||||
| * | remove meaningless AS::FrozenObjectError | Akira Matsuda | 2013-01-02 | 7 | -12/+4 | |
| | |