aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
* Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`.Joost Baaij2012-11-161-0/+5
| | | | | | | | | | | This is a list of mime types where template text is not html escaped by default. It prevents `Jack & Joe` from rendering as `Jack & Joe` for the whitelisted mime types. The default whitelist contains text/plain. This follows a whitelist approach where plain text templates are not escaped, and all the others (json, xml) are. The mime type is assumed to be set by the abstract controller.
* Merge pull request #8222 from marcandre/avoid_slashRafael Mendonça França2012-11-141-1/+1
|\ | | | | Avoid using Integer#/, as it is redefined by the 'mathn' stdlib
| * Avoid using Integer#/, as it is redefined by the 'mathn' stdlibMarc-Andre Lafortune2012-11-141-1/+1
| |
* | Merge pull request #8218 from DawidJanczak/form-tag-docCarlos Antonio da Silva2012-11-141-1/+1
|/ | | | | | | [ci skip] Correct examples for form_tag helper. Conflicts: actionpack/lib/action_view/helpers/form_tag_helper.rb
* Merge pull request #8151 from nashby/forwardableCarlos Antonio da Silva2012-11-091-20/+2
|\ | | | | delegate PathSet's enumerator methods
| * delegate PathSet's enumerator methodsVasiliy Ermolovich2012-11-091-20/+2
| |
* | Fix message about include_blank option.Steve Klabnik + Katrina Owen2012-11-091-1/+1
|/ | | | | See https://github.com/rails/rails/commit/cb7d19b66badfbd1846c195913419c331701074e#commitcomment-2127148.
* Support :multiple option on input tags with :indexDaniel Fox, Grant Hutchins & Trace Wax2012-11-022-6/+4
| | | | | When you have an explicit index set, then when you build an input tag with :multiple => true, it doesn't add [] to the end of its name, although it should.
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-0320-361/+361
|\ | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/mime_responds.rb activerecord/lib/active_record/attribute_methods.rb guides/source/working_with_javascript_in_rails.md
| * Hash Syntax to 1.9 related changesAvnerCohen2012-10-2920-346/+346
| |
| * fix error in AssertTagHelper documentation [ci skip]Cesar Carruitero2012-10-211-5/+5
| |
| * update AssetTagHelper documentation [ci skip]Cesar Carruitero2012-10-211-21/+21
| |
* | Make caller attribute in deprecation methods optionalAlexey Gaziev2012-10-309-16/+15
| |
* | Fix failing tests and use new hash style in deprecation messagesCarlos Antonio da Silva2012-10-294-16/+16
| |
* | Provide a call stack for deprecation warnings where needed.Nikita Afanasenko2012-10-298-15/+38
| | | | | | | | It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly.
* | Improve the deprecation message of link_to_function andRafael Mendonça França2012-10-271-2/+4
| | | | | | | | | | | | button_to_function Point the the Unobtrusive JavaScript secion in the JavaScript guide
* | Fix gratuitous use of ternary operatorCaleb Thompson2012-10-251-2/+5
|/
* check_box value can be not only an object of Array classVasiliy Ermolovich2012-10-201-3/+5
| | | | there is a chance that `value` is a Set or an object that reponses to `include?` method so let's handle this case
* Add i18n scope to disance_of_time_in_words.Steve Klabnik2012-10-191-1/+5
| | | | This fixes #733.
* Merge pull request #7975 from butcher/extend_date_select_helper_functionalityRafael Mendonça França2012-10-181-0/+3
|\ | | | | | | | | | | | | Extend date_select helper functionality. Conflicts: actionpack/CHANGELOG.md
| * Extend date_select helper functionality.Pavel Nikitin2012-10-181-0/+3
| |
* | fix Digestor to be thread safe.Aaron Patterson2012-10-171-8/+30
|/ | | | | Add a lock on the cache so that we don't have concurrency issues when calculating the cache.
* Ignore asset url query string or anchor when appending extensions and ↵Joshua Peek2012-10-151-1/+3
| | | | computing public path
* Extract compute_asset_extname and allow extname to be disabledJoshua Peek2012-10-151-7/+15
|
* Merge branch 'master' into asset-path-helperJoshua Peek2012-10-151-4/+0
|\ | | | | | | | | Conflicts: railties/test/application/configuration_test.rb
| * Removed useless "extend SanitizeHelper::ClassMethods"Andrey Samsonov2012-10-151-4/+0
| | | | | | | | | | Since SanitizeHelper includes ActiveSupport::Concern, extending of it ClassMethods is no needed.
* | :fire: Rails asset id supportJoshua Peek2012-10-154-164/+0
| |
* | merge! default asset tag optionsJoshua Peek2012-10-151-12/+12
| |
* | Just check request instead of controller.requestJoshua Peek2012-10-151-13/+2
| |
* | Allow asset url config to be undefinedJoshua Peek2012-10-131-2/+4
| |
* | All asset url helpers should pass optionsJoshua Peek2012-10-121-24/+24
| |
* | Ensure AssetUrlHelper can be mixed into AC::BaseJoshua Peek2012-10-121-6/+13
| |
* | Refactor AssetUrlHelper to make it friendly for plugins and extensionsJoshua Peek2012-10-127-344/+240
| | | | | | | | | | | | | | | | Add asset_path/url helper for a consolidated entry point Expose compute_asset_path as a public API Expose compute_asset_host as a public API Move RAILS_ASSET_ID to its own module, AssetIdHelper Removed AV::AssetPaths
* | Add asset_path and asset_url helpersJoshua Peek2012-10-122-17/+54
|/
* Split asset url helpers into seperate AssetUrlHelperJoshua Peek2012-10-125-419/+416
|
* Allow for deep directory path for view templates.Andy Shipman2012-10-111-1/+1
|
* refactor `ActionView::TestCase` internals to track rendered localsYves Senn2012-10-111-11/+29
| | | | | this refactoring extracts the semi complex data structure of rendered locals per view into into a separate class
* recognizes when a partial was rendered twice. Closes #3675Yves Senn2012-10-111-5/+8
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-111-1/+1
|\ | | | | | | | | | | Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
| * Closed unclosed <tt>, working on a complete solution for docrails, but ↵AvnerCohen2012-10-081-1/+1
| | | | | | | | testing push process first
* | Remove expansion configJoshua Peek2012-10-101-2/+0
| |
* | Remove old asset tag concatenationJoshua Peek2012-10-104-378/+16
| | | | | | | | Use sprockets, jammit, or some other asset bundler
* | Fix nodoc commentRafael Mendonça França2012-10-071-16/+15
| |
* | More Ruby 1.9 hash syntax.Rafael Mendonça França2012-10-061-52/+47
| |
* | We don't need to check blank? here.Rafael Mendonça França2012-10-061-1/+1
| | | | | | | | | | | | | | | | Also the blank? check introduced a bug. $ rails generate model Foo blank:boolean form_for(Foo.new(:blank => true)) => ArgumentError, "First argument in form cannot contain nil or be empty"
* | Update some code styles.Rafael Mendonça França2012-10-061-50/+48
| | | | | | | | | | * Uses the Ruby 1.9 hash syntax * Avoid escaping " inside string using the %{} syntax
* | Accept :remote as symbol in link_to optionsRiley Lynch2012-10-061-2/+5
| | | | | | | | | | Accept either :remote or 'remote' in both the html_options and (url_)options hash arguments to link_to.
* | Add nodoc to now public fragment_name_with_digestRyan Garver2012-10-041-0/+1
| |
* | Merge branch 'master' into feature/public-fragment_name_with_digestRyan Garver2012-10-023-7/+11
|\ \
| * \ Merge pull request #7708 from bdurand/optimize_log_subscribersRafael Mendonça França2012-10-011-2/+5
| |\ \ | | | | | | | | Optimize log subscribers to check if the log level is sufficient