Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10478 from cainlevy/patch-1 | Rafael Mendonça França | 2013-05-06 | 1 | -1/+1 |
|\ | | | | | use canonical #controller_path logic in controller test cases | ||||
| * | use canonical #controller_path logic in controller test cases | Lance Ivy | 2013-05-05 | 1 | -1/+1 |
| | | |||||
* | | remove unused variable | Vipul A M | 2013-05-06 | 1 | -1/+0 |
| | | |||||
* | | Fix typo in documentation comment | Junya Ogura | 2013-05-06 | 1 | -1/+1 |
|/ | |||||
* | Added missing `require` to ActionView::LookupContext | Vladimir Strakhov | 2013-05-05 | 1 | -0/+1 |
| | |||||
* | Fix generating route from engine to other engine | Piotr Sarnacki | 2013-05-03 | 1 | -1/+2 |
| | | | | | | | | | | | | A regression was introduced in 5b3bb6, generating route from within an engine to an another engine resulted in prefixing a path with the SCRIPT_NAME value. The regression was caused by the fact that SCRIPT_NAME should be appended only if it's the SCRIPT_NAME for the application, not if it's SCRIPT_NAME from the current engine. closes #10409 | ||||
* | Merge pull request #10426 from tkrajcar/rescue-h1-fix | Carlos Antonio da Silva | 2013-05-02 | 1 | -0/+6 |
|\ | | | | | Add styling to h1 for default rescue layout | ||||
| * | Add styling to h1 | Tim Krajcar | 2013-05-02 | 1 | -0/+6 |
| | | |||||
* | | use constant for encoding | Nihad Abbasov | 2013-05-02 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-01 | 1 | -1/+1 |
|\ | |||||
| * | fixed typo in select_tag docs | Rncrtr | 2013-04-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #9857 from yyyc514/bad_params_should_400 | Aaron Patterson | 2013-04-30 | 1 | -0/+1 |
|\ \ | | | | | | | failure to parse params should trigger a 400 Bad Request | ||||
| * | | failure to parse params should trigger a 400 Bad Request | Josh Goebel | 2013-03-21 | 1 | -0/+1 |
| | | | |||||
* | | | add missing semicolon to journey parser.y | Ben Holley | 2013-04-30 | 1 | -0/+1 |
| | | | |||||
* | | | Rack::Mount was replaced by Journey, Fixed comment | Gaurish Sharma | 2013-04-30 | 1 | -1/+1 |
| | | | |||||
* | | | rails/master is now 4.1.0.beta | Rafael Mendonça França | 2013-04-29 | 1 | -1/+1 |
| | | | |||||
* | | | Bump version to rc1 | David Heinemeier Hansson | 2013-04-29 | 1 | -1/+1 |
| | | | |||||
* | | | Don't reprocess the options hash on every request | Andrew White | 2013-04-27 | 1 | -1/+2 |
| | | | |||||
* | | | Revert "Merge pull request #10337 from eimermusic/fix_template_digestor_lookup" | Rafael Mendonça França | 2013-04-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b4239622afc4f3f73808fd0c97512f3a534e07dd, reversing changes made to f99ce3c188f5dde57e2ff63e6a22363c62f0a4cd. Reason: This broke the build https://travis-ci.org/rails/rails/jobs/6629894 | ||||
* | | | 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 |
| | | |