Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fix #5238, rendered_format is not set when template is not rendered | Piotr Sarnacki | 2012-03-02 | 1 | -2/+6 | |
| | ||||||
* | Merge branch '3-2-2' into 3-2-stable | Aaron Patterson | 2012-03-01 | 1 | -1/+8 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-2: bumping to 3.2.2 Ensure [] respects the status of the buffer. Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare Merge pull request #5084 from johndouthat/patch-1 updating RAILS_VERSION delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options | |||||
| * | Merge branch '3-2-stable-security' into 3-2-2 | Aaron Patterson | 2012-03-01 | 1 | -1/+8 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-stable-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options | |||||
| | * | fix output safety issue with select options | Sergey Nartimov | 2012-02-20 | 1 | -1/+8 | |
| | | | ||||||
* | | | Add a new line after the textarea opening tag. | Rafael Mendonça França | 2012-02-27 | 2 | -37/+37 | |
| | | | | | | | | | | | | Closes #393 | |||||
* | | | Adding tests for non-optional glob parameters | Andrew White | 2012-02-26 | 1 | -2/+27 | |
| | | | ||||||
* | | | assert => assert_equal | Arun Agrawal | 2012-02-25 | 1 | -3/+3 | |
| | | | ||||||
* | | | Checking headers in a better way. as doing here | Arun Agrawal | 2012-02-25 | 1 | -4/+3 | |
| | | | | | | | | | | | | 406ece4729e8fd81f156bcb3fce16e938522466e | |||||
* | | | Build fix for ruby187-p358 | Arun Agrawal | 2012-02-25 | 1 | -2/+7 | |
|/ / | ||||||
* | | format lookup for partials is derived from the format in which the template ↵ | Santiago Pastorino | 2012-02-22 | 3 | -4/+9 | |
| | | | | | | | | | | | | is being rendered Closes #5025 part 2 | |||||
* | | Don't wrap the raise with ensure | Santiago Pastorino | 2012-02-21 | 1 | -1/+1 | |
| | | ||||||
* | | Restore lookup formats to the previous value after searching for the failing ↵ | Santiago Pastorino | 2012-02-21 | 1 | -1/+2 | |
| | | | | | | | | view | |||||
* | | Fix some warnings on 3-2-stable | kennyj | 2012-02-21 | 4 | -25/+27 | |
|/ | ||||||
* | Fix a failing test | Santiago Pastorino | 2012-02-20 | 1 | -0/+2 | |
| | ||||||
* | Use the right format when a partial is missing. | Santiago Pastorino | 2012-02-20 | 2 | -0/+8 | |
| | | | | Closes #5025 | |||||
* | Reset memoized hash keys when new entry added | Chris Kelly | 2012-02-20 | 1 | -0/+6 | |
| | ||||||
* | Remove fixture files with Windows incompatible filenames | Andrew White | 2012-02-20 | 13 | -39/+88 | |
| | | | | | | Windows doesn't allow `\ / : * ? " < > |` in filenames so create the fixture files at runtime and ignore the incompatible ones when running on Windows. | |||||
* | Fix ActionDispatch::Static to serve files with unencoded PCHAR | Andrew White | 2012-02-17 | 13 | -0/+40 | |
| | | | | | | | | | | | RFC 3986[1] allows sub-delim characters in path segments unencoded, however Rack::File requires them to be encoded so we use URI's unescape method to leave them alone and then escape them again. Also since the path gets passed to Dir[] we need to escape any glob characters in the path. [1]: http://www.ietf.org/rfc/rfc3986.txt | |||||
* | backporting #4918 to 3.2 stable; adding extra test for accept header given ↵ | Aditya Sanghi | 2012-02-17 | 1 | -0/+12 | |
| | | | | by googlebot | |||||
* | adding tests to document behavior for #4817 | Aaron Patterson | 2012-02-14 | 1 | -0/+26 | |
| | ||||||
* | Rack body respond to each and not to join | Santiago Pastorino | 2012-02-14 | 1 | -0/+12 | |
| | | | | | | | This fixes undef `to_str' for Rack::Chunked::Body when using caches_action + streaming on an action Closes #5027 | |||||
* | Merge pull request #4988 from kennyj/fix_4720-3 | Aaron Patterson | 2012-02-10 | 1 | -0/+26 | |
| | | | | Fix GH #4720. Routing problem with nested namespace and already camelized controller option. | |||||
* | Added unit test to cover changes to RouteSet.url_for | Ryan McGeary | 2012-02-07 | 1 | -0/+16 | |
| | | | | | ActionDispatch::Routing::RouteSet.url_for now handles passing params through to ActionDispatch::Http::Url.url_for | |||||
* | Fixed force_ssl redirects to include original query params | Ryan McGeary | 2012-02-06 | 1 | -0/+6 | |
| | | | | | | `ActionController.force_ssl` redirects http URLs to their https equivalent; however, when a URL contains a query string, the resulting redirect lacked the original query string. | |||||
* | Merge pull request #4908 from kennyj/fix_3864 | José Valim | 2012-02-06 | 1 | -0/+33 | |
| | | | | Fix url_for method's behavior. GH #3684. | |||||
* | Merge pull request #4870 from sikachu/3-2-stable-responder-fix | José Valim | 2012-02-04 | 2 | -0/+35 | |
|\ | | | | | Fix override API response bug in respond_with | |||||
| * | Fix override API response bug in respond_with | Prem Sichanugrist | 2012-02-03 | 2 | -0/+35 | |
| | | | | | | | | | | | | | | | | | | | | Default responder was only using the given respond block when user requested for HTML format, or JSON/XML format with valid resource. This fix the responder so that it will use the given block regardless of the validity of the resource. Note that in this case you'll have to check for object's validity by yourself in the controller. Fixes #4796 | |||||
* | | Merge pull request #4879 from kennyj/fix_4873 | José Valim | 2012-02-04 | 1 | -0/+6 | |
|/ | | | | Fix GH #4873. Allow swapping same class middleware. | |||||
* | don't set the hidden checkbox value if it's nil | Damien Mathieu | 2012-01-27 | 1 | -0/+8 | |
| | ||||||
* | check_box helper with :disabled => true generates disabled hidden field. ↵ | Tadas Tamošauskas | 2012-01-27 | 1 | -4/+3 | |
| | | | | fixes #1953 | |||||
* | Test for unicode path support | Paul McMahon | 2012-01-25 | 1 | -0/+20 | |
| | | | | This is currently broken due to a bug in journey. | |||||
* | Merge pull request #4639 from joevandyk/datetime-infinity-select-fix | Aaron Patterson | 2012-01-24 | 1 | -0/+12 | |
|\ | | | | | datetime_select fix for dates of -infinity and +infinity | |||||
| * | datetime_select should work with -/+ infinity dates | Joe Van Dyk | 2012-01-24 | 1 | -0/+12 | |
| | | ||||||
* | | Remove unused variables to avoid warnings | Rafael Mendonça França | 2012-01-24 | 1 | -3/+0 | |
| | | ||||||
* | | Fix date_select with discard_month and discard_year options | Rafael Mendonça França | 2012-01-24 | 1 | -0/+37 | |
| | | | | | | | | Closes #4553 and #4633 | |||||
* | | Fix date_select nil and blank and order case | Indrek Juhkam | 2012-01-24 | 1 | -17/+1 | |
| | | ||||||
* | | Add failing test for date_select | Indrek Juhkam | 2012-01-24 | 1 | -0/+16 | |
|/ | | | | | date_select does not work when day is discarded, include blank option is enabled and struct date itself is nil. | |||||
* | Added custom regexps to ASTs that have literal nodes on either side of | Aaron Patterson | 2012-01-23 | 1 | -0/+62 | |
| | | | | symbol nodes. Fixes #4585 | |||||
* | Allow form.select to accept ranges. | Jeremy Walker | 2012-01-22 | 1 | -0/+16 | |
| | ||||||
* | Do not deprecate performed? | José Valim | 2012-01-19 | 1 | -0/+6 | |
| | ||||||
* | Deprecate AC::UnknownError and AC::DoubleRenderError | Carlos Antonio da Silva | 2012-01-17 | 4 | -10/+10 | |
| | | | | | Use the constants AbstractController::ActionNotFound and AbstractController::DoubleRenderError respectively instead. | |||||
* | Deprecate default_charset= at controller level | Carlos Antonio da Silva | 2012-01-17 | 1 | -12/+20 | |
| | ||||||
* | Add some deprecations for logic being removed in 4.0 | Carlos Antonio da Silva | 2012-01-17 | 4 | -13/+10 | |
| | ||||||
* | Merge pull request #4462 from spohlenz/fix-routing-tests | Aaron Patterson | 2012-01-16 | 1 | -0/+4 | |
| | | | | Stub ip method of alternative request class in router tests | |||||
* | Use a BodyProxy instead of including a Module that responds to close. | Santiago Pastorino | 2012-01-13 | 1 | -1/+12 | |
| | | | | Closes #4441 if Active Record is disabled assets are delivered correctly | |||||
* | Fix http digest authentication with trailing '/' or '?' (fixes #4038 and #3228) | Piotr Sarnacki | 2012-01-10 | 1 | -2/+43 | |
| | ||||||
* | Add original_fullpath and original_url methods to Request | Piotr Sarnacki | 2012-01-10 | 1 | -0/+24 | |
| | ||||||
* | Infer currency negative format from positive one. | Tsutomu Kuroda | 2012-01-05 | 1 | -0/+7 | |
| | | | | | | | | When a locale file sets the format of the positive currency value as '%n %u', the default negative currency format should be '-%n %u'. Cherry-picked from master (6724c8c8) | |||||
* | When generating routes, the last defined named route wins. This is in | Aaron Patterson | 2012-01-03 | 1 | -15/+23 | |
| | | | | | | | | | | contrast to route recognition where the first recognized route wins. This behavior will not exist in Rails 4.0. See: https://github.com/rails/rails/issues/4245 https://github.com/rails/rails/issues/4164 | |||||
* | Revert "Named Routes shouldn't override existing ones (currently route ↵ | Aaron Patterson | 2012-01-03 | 1 | -2/+2 | |
| | | | | | | recognition goes with the earliest match, named routes use the latest match)" This reverts commit 71d769e3b58cb56b4b1d5143936c65be8b27c490. |