Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10337 from eimermusic/fix_template_digestor_lookup | Rafael Mendonça França | 2013-04-25 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Fix ActionView::Digestor to correctly pass format to LookupContext Conflicts: actionpack/CHANGELOG.md | ||||
| * | AV Digestor correctly passes format to LookupContext | Martin Westin | 2013-04-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | ActionView::Digestor now passes arguments correctly to LookupContext::find method. This makes cache digests respect the format option correctly. FixtureFinder in tests also changed to reflect this. | ||||
* | | Add support for extra options to `force_ssl` | Andrew White | 2013-04-25 | 1 | -17/+48 |
| | | | | | | | | | | | | | | | | This commit adds support for passing additional url options along with a :status option and any of the flash-related options to `redirect_to` (i.e. :flash, :alert & :notice). Closes #7570. | ||||
* | | Use `request.fullpath` to build redirect url in `force_ssl` | Andrew White | 2013-04-25 | 1 | -4/+7 |
|/ | | | | | | | | | | | The `force_ssl` command now builds the redirect url from `request.fullpath`. This ensures that the format is maintained and it doesn't redirect to a route that has the same parameters but is defined earlier in `routes.rb`. Also any optional segments are maintained. Fixes #7528. Fixes #9061. Fixes #10305. | ||||
* | fixed missing comma in example | Ilya Vorontsov | 2013-04-24 | 1 | -1/+1 |
| | |||||
* | applies documentation guidelines | Xavier Noria | 2013-04-22 | 1 | -11/+12 |
| | |||||
* | Merge pull request #10301 from vipulnsward/extract_in_mapper | Andrew White | 2013-04-22 | 1 | -2/+4 |
|\ | | | | | extract arrays to constants in Mapper | ||||
| * | extract arrays to constants in Mapper | Vipul A M | 2013-04-22 | 1 | -2/+4 |
| | | |||||
* | | Merge pull request #10299 from econsultancy/use-method-not-allowed-exception | Andrew White | 2013-04-22 | 1 | -0/+1 |
|\ \ | |/ |/| | Use MethodNotAllowed exception rather than UnknownHttpMethod | ||||
| * | Return a 405 response for unknown HTTP methods | Lewis Marshall | 2013-04-22 | 1 | -0/+1 |
| | | |||||
* | | extract no content response codes to a constant | Vipul A M | 2013-04-22 | 1 | -1/+2 |
|/ | |||||
* | Increase readability of ternary statement in build method | buddhamagnet | 2013-04-20 | 1 | -2/+1 |
| | |||||
* | Merge pull request #10267 from vipulnsward/use_destructive_method | Rafael Mendonça França | 2013-04-19 | 1 | -1/+1 |
|\ | | | | | symbolize_keys => symbolize_keys! on new hash; change sentence | ||||
| * | symbolize_keys => symbolize_keys! on new hash; | Vipul A M | 2013-04-19 | 1 | -1/+1 |
| | | | | | | | | "There're" => There are for better readability | ||||
* | | Adding documentation to actionview so that the big picture of the | wangjohn | 2013-04-18 | 4 | -0/+41 |
|/ | | | | renderer is clearer. | ||||
* | Refactor ActionDispatch::Http::URL.build_host_url | Andrew White | 2013-04-18 | 1 | -20/+49 |
| | | | | | Add support for extracting the port from the :host option and for removing the subdomain by using nil, false or ''. | ||||
* | Duplicate options before mutating them | Andrew White | 2013-04-18 | 2 | -3/+5 |
| | |||||
* | Passing subdomain: '' to url_for removes the subdomain (instead of adding a ↵ | Derek Watson | 2013-04-18 | 2 | -1/+5 |
| | | | | | | leading .) Adding a boolean route constraint checks for presence/absence of request property | ||||
* | Avoid leak into controller's action_methods | printercu | 2013-04-18 | 1 | -0/+1 |
| | |||||
* | Merge pull request #10173 from nashby/element-attributes | Rafael Mendonça França | 2013-04-16 | 1 | -1/+1 |
|\ | | | | | options_from_collection_for_select helper takes html attributes | ||||
| * | options_from_collection_for_select helper takes html attributes | Vasiliy Ermolovich | 2013-04-11 | 1 | -1/+1 |
| | | | | | | | | as the last element of the array | ||||
* | | replace match with get verb in ActionController::Metal | Gaurish Sharma | 2013-04-16 | 1 | -1/+1 |
| | | |||||
* | | make [] method in router more readable | buddhamagnet | 2013-04-15 | 1 | -1/+3 |
| | | |||||
* | | Fix a typo | Viktar Basharymau | 2013-04-12 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-04-11 | 36 | -78/+110 |
|\ \ | |/ |/| | | | | | Conflicts: guides/source/action_mailer_basics.md | ||||
| * | improve accuracy of simple_format documentation. span doesn't get sanitized. | RSL | 2013-04-09 | 1 | -2/+5 |
| | | |||||
| * | Typo fix | Carson McDonald | 2013-04-05 | 1 | -3/+3 |
| | | |||||
| * | fix broken format in ActionView::Helpers::AssetTagHelper [ci skip] | Francesco Rodriguez | 2013-04-04 | 1 | -4/+9 |
| | | |||||
| * | mark ActionView::Helpers::Tags as :nodoc: [ci skip] | Francesco Rodriguez | 2013-04-04 | 33 | -68/+67 |
| | | |||||
| * | fix broken format in ActionView::Helpers::NumberHelper [ci skip] | Francesco Rodriguez | 2013-04-03 | 1 | -0/+25 |
| | | |||||
| * | Fix typo | Carson McDonald | 2013-03-31 | 1 | -1/+1 |
| | | |||||
* | | Return nil for Mime::NullType#ref | Andrew White | 2013-04-10 | 2 | -1/+5 |
| | | |||||
* | | Reverts rendering behavior when format is unknown | Grzegorz Świrski | 2013-04-10 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | If a request has unknown format (eg. /foo.bar), the renderer fallbacks to default format. This patch reverts Rails 3.2 behavior after c2267db commit. Fixes issue #9654. | ||||
* | | Use camelize instead of capitalize on error screen | Nikolay Shebanov | 2013-04-10 | 1 | -1/+1 |
| | | |||||
* | | Fix typo | Rafael Mendonça França | 2013-04-09 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #10148 from vipulnsward/traces_change | Carlos Antonio da Silva | 2013-04-09 | 1 | -6/+4 |
|\ \ | | | | | | | change array of array to hash | ||||
| * | | change array of array to hash | Vipul A M | 2013-04-09 | 1 | -6/+4 |
| | | | |||||
* | | | fix AP warning; remove unused variable | Vipul A M | 2013-04-09 | 1 | -0/+1 |
|/ / | |||||
* | | Mark unused variables and make some style fixes | Agis Anastasopoulos | 2013-04-08 | 9 | -13/+13 |
| | | | | | | | | It'd be a nice convention to mark the unused variables like this, now that Ruby 2 will issue no warnings for such vars being unused. | ||||
* | | Merge pull request #9604 from sgrif/live_streaming_exceptions | Rafael Mendonça França | 2013-04-08 | 1 | -0/+28 |
|\ \ | | | | | | | Exceptions raised when using ActionController::Live cause server crash | ||||
| * | | Exception handling for controllers using ActionController::Live | Sean Griffin | 2013-03-18 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Any exceptions that occured at the view or controller level for a controller using ActionController::Live would cause the server to either hang with an open socket indefinitely, or immediately crash (depending on whether the server was launched with rails s or directly). Changed the behavior of exceptions to act the same as streaming templates for html requests, and allow for an on_error callback if needed. | ||||
* | | | Merge pull request #10122 from wangjohn/adding_documentation_to_form_builder | Rafael Mendonça França | 2013-04-08 | 1 | -2/+55 |
|\ \ \ | | | | | | | | | | | | | | | | | Added documentation to the FormBuilder class Closes #10115 | ||||
| * | | | Added documentation to the FormBuilder class, should help | wangjohn | 2013-04-06 | 1 | -2/+55 |
| | | | | | | | | | | | | | | | | | | | | clarify issue #10115. Also made the field_helpers an explicit list of methods. | ||||
* | | | | Merge pull request #10130 from Agis-/patch-2 | Carlos Antonio da Silva | 2013-04-08 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Mark unused block parameters. | ||||
| * | | | | Remove unused block parameters | Agis Anastasopoulos | 2013-04-07 | 1 | -3/+3 |
| |/ / / | |||||
* / / / | Remove unecessary variable call, `#sort!` always returns an array | Agis Anastasopoulos | 2013-04-07 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge pull request #10101 from wangjohn/refactoring_routing_mapper | Andrew White | 2013-04-06 | 1 | -12/+13 |
|\ \ \ | | | | | | | | | Refactoring some reused code into a method (inside of the routes mapper) | ||||
| * | | | Refactoring some reused code into a method (inside of the routes | wangjohn | 2013-04-05 | 1 | -12/+13 |
| | | | | | | | | | | | | | | | | mapper) and adding a constant for all the possible scopes. | ||||
* | | | | change some more merge to merge! on new hashes | Vipul A M | 2013-04-06 | 1 | -3/+3 |
| | | | | |||||
* | | | | Remove extra whitespace | Agis Anastasopoulos | 2013-04-06 | 1 | -4/+4 |
| | | | |