Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-master | Santiago Pastorino | 2012-03-27 | 3 | -8/+12 |
|\ | | | | | Don't break Haml with textarea newline fix. (master) | ||||
| * | Don't break Haml with textarea newline fix. | James Coleman | 2012-03-27 | 3 | -8/+12 |
| | | | | | | | | | | | | See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation. | ||||
* | | adds delegetion for eof? to AD::Http::UploadedFile | Jens Fahnenbruck | 2012-03-27 | 2 | -1/+7 |
|/ | | | | | if you want to read the file you may need to ask if there is something to read from | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-27 | 3 | -2/+21 |
|\ | |||||
| * | add missing do [ci skip] | Vijay Dev | 2012-03-27 | 1 | -1/+1 |
| | | |||||
| * | Proc objects for caches_page no need controller object | Alexey Vakhov | 2012-03-27 | 1 | -1/+1 |
| | | |||||
| * | added shallow_prefix option description in documantation | Lukasz Sarnacki | 2012-03-27 | 1 | -0/+19 |
| | | | | | | | | It is in response for confusion in issue #5301 | ||||
| * | Fix AC actions caching comment | Alexey Vakhov | 2012-03-24 | 1 | -1/+1 |
| | | |||||
* | | If partial is rendered in controller, grab format from template | Piotr Sarnacki | 2012-03-27 | 3 | -2/+22 |
| | | | | | | | | | | | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header. | ||||
* | | change number_with_precision to not return negative zeros | Tim McEwan | 2012-03-27 | 2 | -0/+2 |
| | | |||||
* | | Don't ignore non Enumerable values passed to sanitize (closes #5585) | Piotr Sarnacki | 2012-03-27 | 2 | -0/+29 |
| | | | | | | | | | | | | | | | | | | When someone accidentally passes a string to sanitize like: sanitize("<span>foo</span>", :tags => "b") there is no indication that it's the wrong way and span will not be removed. | ||||
* | | Remove warning added by my own commit :fire: | Carlos Antonio da Silva | 2012-03-26 | 1 | -1/+1 |
| | | | | | | | | Commit: 7a0cf2f5294e8bcef547642435636b394340a3e4 | ||||
* | | Return the same session data object when setting session id | Carlos Antonio da Silva | 2012-03-26 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #5561 from carlosantoniodasilva/form-builder-block-arg | Aaron Patterson | 2012-03-26 | 2 | -3/+21 |
|\ \ | | | | | | | Properly deprecate the block argument in AV FormBuilder | ||||
| * | | Properly deprecate the block argument in AV FormBuilder | Carlos Antonio da Silva | 2012-03-23 | 2 | -3/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 56089ca986c767763f29159c8de0aa1ebabfd4d2 introduced a backward incompatible change by changing the method signature of the FormBuilder. This brings back the same method signature warning in case someone gives a block to the builder. More info: https://github.com/rails/rails/commit/56089ca986c767763f29159c8de0aa1ebabfd4d2#commitcomment-1116166 | ||||
* | | | apply form_for namespace option to date_select | Sergey Nartimov | 2012-03-26 | 2 | -1/+12 |
| | | | |||||
* | | | Merge pull request #5183 from lest/patch-1 | José Valim | 2012-03-26 | 1 | -2/+3 |
|\ \ \ | | | | | | | | | use content_tag in button_to helper | ||||
| * | | | use content_tag in button_to helper | Sergey Nartimov | 2012-03-14 | 1 | -2/+3 |
| | | | | |||||
* | | | | Allow a defining custom member field on resources | Jamie Macey | 2012-03-25 | 2 | -4/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, resources routes are created with :resource/:id. A model defining to_param can make prettier urls by using something more readable than an integer ID, but since the route picks it up as :id you wind up with awkward User.find_by_username(params[:id]) calls. By overriding the key to be used in @request.params you can be more obvious in your intent. | ||||
* | | | | Merge pull request #5570 from avakhov/ac-caching-split | Jeremy Kemper | 2012-03-24 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | ActionController caching small String#split optimization | ||||
| * | | | | ActionController caching small String#split optimization | Alexey Vakhov | 2012-03-24 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
* / | | | Revert "Return an actual boolean from xml_http_request?" | Xavier Noria | 2012-03-25 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: This commit changes code that was committed some year and a half ago. The original code is an ordinary predicate that delegates straight to a boolean operator with no further unnecessaru adorments, as clearly explained in #5329. This change also may confuse users who may now believe they can rely now on singletons, while predicates in Rails rely on standard Ruby semantics for boolean values and guarantee no singletons whatsover. This reverts commit 6349791d5aaf652631b29f1371701fc2985fda83. | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-24 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: guides/source/ruby_on_rails_guides_guidelines.textile | ||||
| * | | | Fixed-width font fix for instance variable | Juanjo Bazán | 2012-03-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Return an actual boolean from xml_http_request? | Tim Pope | 2012-03-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #5518 from rafaelfranca/minor-refactor | José Valim | 2012-03-23 | 1 | -11/+11 |
|\ \ \ \ | | | | | | | | | | | Remove code duplication | ||||
| * | | | | Remove code duplication | Rafael Mendonça França | 2012-03-19 | 1 | -11/+11 |
| | | | | | |||||
* | | | | | Use the new scope syntax | Rafael Mendonça França | 2012-03-23 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | We dont need to merge in the parameters as thats all being reset by the rack ↵ | David Heinemeier Hansson | 2012-03-20 | 1 | -1/+0 |
|/ / / | | | | | | | | | | headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing) | ||||
* | | | Fix secure cookies when there are more than one space before the secure | Rafael Mendonça França | 2012-03-19 | 2 | -1/+29 |
| | | | | | | | | | | | | keyword | ||||
* | | | Remove exclude option from ActionDispatch::SSL | Rafael Mendonça França | 2012-03-19 | 2 | -13/+0 |
| | | | |||||
* | | | Merge pull request #5503 from jeyb/leap_day_time_date_time_selector | Andrew White | 2012-03-19 | 3 | -13/+27 |
|\ \ \ | |/ / |/| | | Fixes issue #5222: DateTimeSelector builds invalid dates on leap days | ||||
| * | | Fixes issue #5222: DateTimeSelector builds invalid dates on leap day when ↵ | Jey Balachandran | 2012-03-18 | 3 | -13/+27 |
| | | | | | | | | | | | | discarding both day and month. | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-19 | 1 | -19/+116 |
|\ \ \ | |/ / |/| | | |||||
| * | | respond_with description: changed 'response' to 'format' | Mark Thomson | 2012-03-18 | 1 | -1/+1 |
| | | | |||||
| * | | Revised comments for respond_with | Mark Thomson | 2012-03-18 | 1 | -17/+18 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' | Mark Thomson | 2012-03-17 | 77 | -1264/+536 |
| |\ \ | |||||
| * | | | Revised description for responds_with | Mark Thomson | 2012-03-17 | 1 | -19/+115 |
| | | | | |||||
* | | | | time_tag support for blocks | Antonio Tapiador del Dujo | 2012-03-18 | 2 | -2/+11 |
| | | | | |||||
* | | | | Update the guides and CHANGELOG | Rafael Mendonça França | 2012-03-17 | 1 | -2/+4 |
| | | | | |||||
* | | | | Whitespaces :scissors: | Rafael Mendonça França | 2012-03-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Some refactoring and update ActionDispatch::SSL code to use the Rack 1.4.x | Rafael Mendonça França | 2012-03-17 | 2 | -37/+13 |
| | | | | |||||
* | | | | Rack::SSL -> ActionDispatch::SSL | Rafael Mendonça França | 2012-03-17 | 3 | -0/+237 |
| |/ / |/| | | |||||
* | | | Add missing require | Santiago Pastorino | 2012-03-17 | 1 | -0/+1 |
| | | | |||||
* | | | Remove unused require | Santiago Pastorino | 2012-03-17 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-17 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/getting_started.textile | ||||
| * | | | Minor clarification in documentation language and spelling | Matthew Daubert | 2012-03-13 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #5480 from drogus/rendering-issues | José Valim | 2012-03-17 | 8 | -0/+46 |
| | | | | | | | | | | | | | | | | Fix for #5440 | ||||
* | | | | Should use an argument in http_digest_authentication_test.rb | kennyj | 2012-03-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #5470 from sandeepravi/warning_fixes | José Valim | 2012-03-17 | 1 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | fixed - warning: instance variable @controller not initialized |