aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10337 from eimermusic/fix_template_digestor_lookupRafael Mendonça França2013-04-251-1/+1
|\ | | | | | | | | | | | | Fix ActionView::Digestor to correctly pass format to LookupContext Conflicts: actionpack/CHANGELOG.md
| * AV Digestor correctly passes format to LookupContextMartin Westin2013-04-251-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 White2013-04-251-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 White2013-04-251-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 exampleIlya Vorontsov2013-04-241-1/+1
|
* applies documentation guidelinesXavier Noria2013-04-221-11/+12
|
* Merge pull request #10301 from vipulnsward/extract_in_mapperAndrew White2013-04-221-2/+4
|\ | | | | extract arrays to constants in Mapper
| * extract arrays to constants in MapperVipul A M2013-04-221-2/+4
| |
* | Merge pull request #10299 from econsultancy/use-method-not-allowed-exceptionAndrew White2013-04-221-0/+1
|\ \ | |/ |/| Use MethodNotAllowed exception rather than UnknownHttpMethod
| * Return a 405 response for unknown HTTP methodsLewis Marshall2013-04-221-0/+1
| |
* | extract no content response codes to a constantVipul A M2013-04-221-1/+2
|/
* Increase readability of ternary statement in build methodbuddhamagnet2013-04-201-2/+1
|
* Merge pull request #10267 from vipulnsward/use_destructive_methodRafael Mendonça França2013-04-191-1/+1
|\ | | | | symbolize_keys => symbolize_keys! on new hash; change sentence
| * symbolize_keys => symbolize_keys! on new hash;Vipul A M2013-04-191-1/+1
| | | | | | | | "There're" => There are for better readability
* | Adding documentation to actionview so that the big picture of thewangjohn2013-04-184-0/+41
|/ | | | renderer is clearer.
* Refactor ActionDispatch::Http::URL.build_host_urlAndrew White2013-04-181-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 themAndrew White2013-04-182-3/+5
|
* Passing subdomain: '' to url_for removes the subdomain (instead of adding a ↵Derek Watson2013-04-182-1/+5
| | | | | | leading .) Adding a boolean route constraint checks for presence/absence of request property
* Avoid leak into controller's action_methodsprintercu2013-04-181-0/+1
|
* Merge pull request #10173 from nashby/element-attributesRafael Mendonça França2013-04-161-1/+1
|\ | | | | options_from_collection_for_select helper takes html attributes
| * options_from_collection_for_select helper takes html attributesVasiliy Ermolovich2013-04-111-1/+1
| | | | | | | | as the last element of the array
* | replace match with get verb in ActionController::MetalGaurish Sharma2013-04-161-1/+1
| |
* | make [] method in router more readablebuddhamagnet2013-04-151-1/+3
| |
* | Fix a typoViktar Basharymau2013-04-121-1/+1
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-1136-78/+110
|\ \ | |/ |/| | | | | Conflicts: guides/source/action_mailer_basics.md
| * improve accuracy of simple_format documentation. span doesn't get sanitized.RSL2013-04-091-2/+5
| |
| * Typo fixCarson McDonald2013-04-051-3/+3
| |
| * fix broken format in ActionView::Helpers::AssetTagHelper [ci skip]Francesco Rodriguez2013-04-041-4/+9
| |
| * mark ActionView::Helpers::Tags as :nodoc: [ci skip]Francesco Rodriguez2013-04-0433-68/+67
| |
| * fix broken format in ActionView::Helpers::NumberHelper [ci skip]Francesco Rodriguez2013-04-031-0/+25
| |
| * Fix typoCarson McDonald2013-03-311-1/+1
| |
* | Return nil for Mime::NullType#refAndrew White2013-04-102-1/+5
| |
* | Reverts rendering behavior when format is unknownGrzegorz Świrski2013-04-102-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 screenNikolay Shebanov2013-04-101-1/+1
| |
* | Fix typoRafael Mendonça França2013-04-091-2/+2
| |
* | Merge pull request #10148 from vipulnsward/traces_changeCarlos Antonio da Silva2013-04-091-6/+4
|\ \ | | | | | | change array of array to hash
| * | change array of array to hashVipul A M2013-04-091-6/+4
| | |
* | | fix AP warning; remove unused variableVipul A M2013-04-091-0/+1
|/ /
* | Mark unused variables and make some style fixesAgis Anastasopoulos2013-04-089-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_exceptionsRafael Mendonça França2013-04-081-0/+28
|\ \ | | | | | | Exceptions raised when using ActionController::Live cause server crash
| * | Exception handling for controllers using ActionController::LiveSean Griffin2013-03-181-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_builderRafael Mendonça França2013-04-081-2/+55
|\ \ \ | | | | | | | | | | | | | | | | Added documentation to the FormBuilder class Closes #10115
| * | | Added documentation to the FormBuilder class, should helpwangjohn2013-04-061-2/+55
| | | | | | | | | | | | | | | | | | | | clarify issue #10115. Also made the field_helpers an explicit list of methods.
* | | | Merge pull request #10130 from Agis-/patch-2Carlos Antonio da Silva2013-04-081-3/+3
|\ \ \ \ | | | | | | | | | | Mark unused block parameters.
| * | | | Remove unused block parametersAgis Anastasopoulos2013-04-071-3/+3
| |/ / /
* / / / Remove unecessary variable call, `#sort!` always returns an arrayAgis Anastasopoulos2013-04-071-1/+0
|/ / /
* | | Merge pull request #10101 from wangjohn/refactoring_routing_mapperAndrew White2013-04-061-12/+13
|\ \ \ | | | | | | | | Refactoring some reused code into a method (inside of the routes mapper)
| * | | Refactoring some reused code into a method (inside of the routeswangjohn2013-04-051-12/+13
| | | | | | | | | | | | | | | | mapper) and adding a constant for all the possible scopes.
* | | | change some more merge to merge! on new hashesVipul A M2013-04-061-3/+3
| | | |
* | | | Remove extra whitespaceAgis Anastasopoulos2013-04-061-4/+4
| | | |