aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Refactored two methods to use delete with a blockRuben Fonseca2012-02-212-2/+2
|
* Restore lookup formats to the previous value after searching for the failing ↵Santiago Pastorino2012-02-211-1/+3
| | | | view
* use Hash#delete on styelsheet_link_tagRuben Fonseca2012-02-211-3/+3
|
* use Hash#delete with a default blockAaron Patterson2012-02-201-3/+3
|
* Merge pull request #5102 from nashby/form-option-refactorJosé Valim2012-02-201-12/+13
|\ | | | | form option refactor
| * refactor options_for_selectVasiliy Ermolovich2012-02-201-7/+8
| |
| * refactor grouped_options_for_selectVasiliy Ermolovich2012-02-201-5/+5
| |
* | Use the right format when a partial is missing.Santiago Pastorino2012-02-201-0/+1
| | | | | | | | Closes #5025
* | Merge pull request #5101 from ckdake/ckdake_actionview_handler_resetJosé Valim2012-02-201-0/+1
| | | | | | | | | | | | | | Reset memoized hash keys when new ActionView::Template handler is registered Conflicts: actionpack/lib/action_view/template/handlers.rb
* | search private / protected methods in trunk rubyAaron Patterson2012-02-201-1/+1
|/
* Merge pull request #5082 from ↵Aaron Patterson2012-02-201-1/+2
|\ | | | | | | | | willbryant/assigns_should_not_stringify_values_master assigns(:foo) should not convert @foo's keys to strings if it happens to be a hash
| * assigns(:foo) should not convert @foo's keys to strings if it happens to be ↵Will Bryant2012-02-181-1/+2
| | | | | | | | a hash
* | Merge pull request #5083 from nashby/grouped-select-optionsJosé Valim2012-02-201-1/+6
|\ \ | | | | | | add selected and disabled options to grouped select
| * | add selected and disabled option to grouped selectVasiliy Ermolovich2012-02-181-1/+6
| |/
* | Integration tests support the OPTIONS http methodJeremy Kemper2012-02-191-1/+7
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-182-7/+7
|\ \ | |/ |/|
| * 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-182-0/+17
|\ \ | | | | | | 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
| | |
* | | Simplify regexpAndrew White2012-02-171-1/+1
| | |
* | | Fix ActionDispatch::Static to serve files with unencoded PCHARAndrew White2012-02-171-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-171-2/+6
| | |
* | | escape static file path to prevent double unescapingSergey Nartimov2012-02-161-1/+1
| | |
* | | Rack body respond to each and not to joinSantiago Pastorino2012-02-141-2/+4
| | | | | | | | | | | | | | | | | | | | | 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-143-9/+10
|\ \ \ | | | | | | | | 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-133-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-1/+1
|\ \ \ \ | |/ / / |/| | | Exclude rack.request.form_vars from request.filtered_env
| * | | Exclude rack.request.form_vars from request.filtered_envChad Jolly2012-01-181-1/+1
| | | |
* | | | 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-131-1/+0
| | | |
* | | | Add HTML5 input[type="date"] helperOlek Janiszewski2012-02-125-1/+43
| | | |
* | | | Fix GH #4720. Routing problem with nested namespace and already camelized ↵kennyj2012-02-101-0/+5
| |_|/ |/| | | | | | | | 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.
* | | | Fix match docsRafael Mendonça França2012-02-071-1/+1
| | | |
* | | | Trim down Active Model API by removing valid? and errors.full_messagesJosé Valim2012-02-071-1/+1
| | | |
* | | | Fixed force_ssl redirects to include original query paramsRyan McGeary2012-02-072-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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-071-1/+1
|\ \ \ \ | | | | | | | | | | 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-071-1/+1
| | | | |
* | | | | Merge pull request #2632 from gsterndale/replace_trusted_proxiesJosé Valim2012-02-071-4/+6
|\ \ \ \ \ | | | | | | | | | | | | Trusted proxies are configurable
| * | | | | Trusted proxies is replaced with a Regexp or appended to with a StringGreg Sterndale2012-02-071-4/+6
| |/ / / /
* | | | | Merge pull request #4918 from scottwb/fix-single-accept-with-qJosé Valim2012-02-071-1/+3
|\ \ \ \ \ | |/ / / / |/| | | | 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
| | | | |
* | | | | Always use content_tag for audio/video tagRafael Mendonça França2012-02-071-1/+1
|/ / / / | | | | | | | | | | | | Closes #4919
* | | | Fix url_for method's behavior when it is called with :controller option ↵kennyj2012-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | which starts with "/" from multiple nested controller. Closes #3864