aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-183-8/+8
|\
| * Fix actionpack readme weblog exampleAlexey Vakhov2012-02-181-1/+1
| |
| * Fix AbstractController::Base#hidden_actions commentAlexey Vakhov2012-02-181-2/+2
| |
| * Update f.button docs to reflect real label implementationCarlos Antonio da Silva2012-02-141-5/+5
| |
* | Merge pull request #3479 from arvida/ensure-date-header-on-expires-inJosé Valim2012-02-183-0/+24
|\ \ | | | | | | Ensure Date header on expires_in
| * | Ensuring a HTTP Date header when setting Cache-Control's max-age with ↵arvida2011-10-311-0/+3
| | | | | | | | | | | | #expires_in
| * | Added accessor methods for Date headerarvida2011-10-311-0/+14
| | |
| * | Added test for setting of HTTP Date header when calling #expires_inarvida2011-10-311-0/+7
| | |
* | | Simplify regexpAndrew White2012-02-171-1/+1
| | |
* | | Fix ActionDispatch::Static to serve files with unencoded PCHARAndrew White2012-02-1714-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | let expires_in accept a must_revalidate flagXavier Noria2012-02-173-2/+29
| | |
* | | escape static file path to prevent double unescapingSergey Nartimov2012-02-163-1/+6
| | |
* | | ActionDispatch: add missing test for callbacksBogdan Gusiev2012-02-161-2/+9
| | |
* | | fixing AP testsAaron Patterson2012-02-151-1/+1
| | |
* | | adding tests to document behavior for #4817Aaron Patterson2012-02-141-0/+26
| | |
* | | Rack body respond to each and not to joinSantiago Pastorino2012-02-142-2/+16
| | | | | | | | | | | | | | | | | | | | | This fixes undef `to_str' for Rack::Chunked::Body when using caches_action + streaming on an action Closes #5027
* | | Remove not used button translation from av localeCarlos Antonio da Silva2012-02-141-8/+1
| | |
* | | Merge pull request #5032 from carlosantoniodasilva/collection-helpers-objectJosé Valim2012-02-144-9/+36
|\ \ \ | | | | | | | | Allow collection helpers with block to access current object in the collection
| * | | Allow collection helpers with block to access current object in the collectionCarlos Antonio da Silva2012-02-134-9/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives a lot more flexibility to the user, for instance to generate a collection of check boxes and labels, allowing to add custom classes or data-* attributes to the label/check_box using another object attribute. This basically mimics options_for_select functionality that accepts a third option for each item to generate html attributes for each option.
* | | | Merge pull request #3305 from cjolly/request_filtered_envJeremy Kemper2012-02-132-1/+34
|\ \ \ \ | |/ / / |/| | | Exclude rack.request.form_vars from request.filtered_env
| * | | Exclude rack.request.form_vars from request.filtered_envChad Jolly2012-01-182-1/+34
| | | |
* | | | Use Hash#fetch instead of testing for #key?Carlos Antonio da Silva2012-02-132-3/+3
| | | |
* | | | Refactor sprockets compressors moduleCarlos Antonio da Silva2012-02-131-20/+22
| | | |
* | | | remove unwanted require for string encodingVishnu Atrai2012-02-132-2/+0
| | | |
* | | | Merge pull request #5016 from exviva/form_helper_date_fieldsJosé Valim2012-02-128-2/+77
|\ \ \ \ | | | | | | | | | | Add HTML5 input[type="date"] helper
| * | | | Add HTML5 input[type="date"] helperOlek Janiszewski2012-02-128-2/+77
| | | | |
* | | | | Removing old Controller testThiago Pradi2012-02-123-39/+0
|/ / / /
* | | | Cleaning Route generation testsThiago Pradi2012-02-122-58/+2
| | | |
* | | | say goodbye to #with_test_routes :axe:Xavier Noria2012-02-101-1166/+947
| | | |
* | | | fixes a regression introduced by 532cd4, and a bogus test in AP the ↵Xavier Noria2012-02-101-6/+6
| | | | | | | | | | | | | | | | regression uncovered
* | | | Fix GH #4720. Routing problem with nested namespace and already camelized ↵kennyj2012-02-102-0/+31
| |_|/ |/| | | | | | | | controller option.
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-092-4/+4
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb
| * | | Stop referring to Atom as "ATOM"Tom Stuart2012-02-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | $ curl -s http://www.ietf.org/rfc/rfc4287 | grep -io ATOM | sort | uniq -c 582 atom 175 Atom
| * | | Remove assert_select_feed from assert_select_encoded documentationTom Stuart2012-02-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This documentation came from the assert_select plugin, but the assert_select_feed method was omitted when the plugin was merged into Rails in 3142502964f94d6144312ae2c368b4c4589fa25a.
* | | | Merge pull request #4957 from ganeshkumar/order_hash_changeXavier Noria2012-02-091-3/+2
|\ \ \ \ | | | | | | | | | | replacing the orderhash with hash for ruby-1.9
| * | | | replacing the orderhash with hash for ruby-1.9ganesh2012-02-091-3/+2
| | | | |
* | | | | removed unnecessary codeganesh2012-02-091-1/+0
|/ / / /
* | | | Fix match docsRafael Mendonça França2012-02-071-1/+1
| | | |
* | | | Merge pull request #4932 from carlosantoniodasilva/fix-request-testJosé Valim2012-02-071-1/+1
|\ \ \ \ | | | | | | | | | | Fix failing request test
| * | | | Fix failing request testCarlos Antonio da Silva2012-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Latest changes in remote ip handling conflicted with each other in tests. Related: dd09811fa6214a130fdc2de1d4c00b4337cb15f9 6a720226aad2adffcbd2422d40db772719579e2f
* | | | | Trim down Active Model API by removing valid? and errors.full_messagesJosé Valim2012-02-071-1/+1
|/ / / /
* | | | Added unit test to cover changes to RouteSet.url_forRyan McGeary2012-02-071-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Routing::RouteSet.url_for now handles passing params through to ActionDispatch::Http::Url.url_for Conflicts: actionpack/test/controller/base_test.rb
* | | | Fixed force_ssl redirects to include original query paramsRyan McGeary2012-02-073-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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. Conflicts: actionpack/lib/action_controller/metal/force_ssl.rb
* | | | Merge pull request #2490 from gsterndale/x_forwarded_for_orderJosé Valim2012-02-072-5/+5
|\ \ \ \ | | | | | | | | | | The first IP address in the X-Forwarded-For header is the originating IP
| * | | | The first IP address in the X-Forwarded-For header is the originating IPGreg Sterndale2012-02-072-5/+5
| | | | |
* | | | | Merge pull request #2632 from gsterndale/replace_trusted_proxiesJosé Valim2012-02-072-6/+19
|\ \ \ \ \ | | | | | | | | | | | | Trusted proxies are configurable
| * | | | | Trusted proxies is replaced with a Regexp or appended to with a StringGreg Sterndale2012-02-072-6/+19
| |/ / / /
* | | | | Merge pull request #4918 from scottwb/fix-single-accept-with-qJosé Valim2012-02-072-1/+9
|\ \ \ \ \ | |/ / / / |/| | | | Fix MIME::Type.parse handling of single media with a q value
| * | | | Correctly handle single media with q value. Fixes #736.Scott W. Bradley2012-02-061-1/+3
| | | | |
| * | | | Failing test case that shows issue #736 should still be open.Scott W. Bradley2012-02-061-0/+6
| | | | |