aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
* Refactor mail_to to not generate intermediate hashes when adding hrefCarlos Antonio da Silva2013-04-041-5/+6
| | | | | | There's no need to use Hash#merge with a new hash just for setting the href option to pass it through. Since we're always dealing with a new html_options hash, we're free to just set the value instead.
* Ensure mail_to helper does not modify the given html options hashCarlos Antonio da Silva2013-04-041-3/+3
|
* Add block support for the helperSam Pohlenz2013-04-031-5/+16
|
* Fix grammatical error on JS helper warning messagethenickcox2013-04-021-2/+2
| | | | | | Add changelog entry Delete changelog
* typo recomend -> recommendogawaso2013-04-011-2/+2
|
* Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-selectCarlos Antonio da Silva2013-03-311-1/+1
|\ | | | | Revert grep to select since they are not the same
| * Revert grep to select since they are not the sameBrian McManus2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous commit swapped out a call to select for a call to grep in time_zone_options_for_select. This behavior actually causes the regexp priority option to stop working. ActiveSupport::TimeZone overrides the =~ operator which is what the select block was using previously. Enumerable#grep checks pattern === element and in this case that would be /US/ === ActiveSupport::TimeZone which does not work because ActiveSupport::TimeZone does not supply an implicit converting to_str method, only an explicit to_s method. It would be impossible to provide a to_str method that behaves identically to the =~ method provided on ActiveSupport::TimeZone so the only option is to revert back to using select with =~.
* | Merge pull request #10015 from vipulnsward/remove_unused_variable_in_getSteve Klabnik2013-03-311-1/+1
|\ \ | | | | | | remove unused variable and assignment
| * | remove unused variable and assignmentVipul A M2013-03-311-1/+1
| | |
* | | remove unused match variables in selectorVipul A M2013-03-311-8/+8
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-302-17/+1
|\ \ | |/ |/| | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip]
| * Fix typoCarson McDonald2013-03-261-1/+1
| |
| * Remove duplicated accepts_nested_attributes descriptionma2gedev2013-03-221-16/+0
| | | | | | | | there are just the same description about accepts_nested_attributes [ci skip]
* | Merge branch 'master-sec'Aaron Patterson2013-03-181-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | * master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854]
| * | fix protocol checking in sanitization [CVE-2013-1857]Aaron Patterson2013-03-151-2/+2
| | |
| * | fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]Charlie Somerville2013-03-151-3/+3
| | |
* | | Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacksCarlos Antonio da Silva2013-03-181-1/+7
|\ \ \ | | | | | | | | i18n locale fallback for localized views
| * | | Include I18n fallbacks in :locale lookup contextJuan Barreneche2013-03-161-1/+7
| | |/ | |/|
* | | Merge pull request #9754 from macksmind/fix_actionpack_warningsRafael Mendonça França2013-03-171-1/+2
|\ \ \ | | | | | | | | Fix rake test warnings in actionpack
| * | | Fix rake test warnings in actionpackMack Earnhardt2013-03-171-1/+2
| |/ /
* / / Allow pass multipart option to form_forGrzegorz Derebecki2013-03-171-1/+1
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-101-1/+1
|\ \
| * | Update capture_helper.rbJess Brown2013-03-061-1/+1
| |/ | | | | if there's content for the right column, then we need the two-column class, if not the one-column
* | Fix incorrectly appended square brackets to a multiple select boxOlek Janiszewski2013-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If an explicit name has been given and it already ends with "[]" Before: select(:category, [], {}, multiple: true, name: "post[category][]") # => <select name="post[category][][]" ...> After: select(:category, [], {}, multiple: true, name: "post[category][]") # => <select name="post[category][]" ...>
* | Fix hash spaces and use 1.9 style hash [ci skip]Carlos Antonio da Silva2013-03-071-1/+1
| |
* | Merge pull request #9464 from jcoyne/assert_template_fileRafael Mendonça França2013-03-072-1/+2
|\ \ | | | | | | Allow use of assert_template with the :file option.
| * | Allow use of assert_template with the :file option.Justin Coyne2013-03-012-1/+2
| | | | | | | | | | | | This worked in Rails 3.2, but was a regression in 4.0.0.beta1
* | | Typo in comment to ActionView::Resolver#find_allRKushnir2013-03-061-1/+1
| | |
* | | Use gsub intead of tr when the to_str is longer than the from_strrobertomiranda2013-03-051-1/+1
| |/ |/|
* | change useless gsub to trrobertomiranda2013-03-051-1/+1
| |
* | change useless gsub to deleteBenjamin Sullivan2013-03-051-1/+1
|/
* Merge pull request #9366 from killthekitten/fix-content_for-regressionRafael Mendonça França2013-02-281-1/+1
|\ | | | | Fix for #9360 content_for regression
| * Fix #9360 regression in content_forNikolay Shebanov2013-02-251-1/+1
| |
* | remove private attribute? warningFrancesco Rodriguez2013-02-261-1/+3
| |
* | Merge pull request #8530 from dasch/dependency-trackersDavid Heinemeier Hansson2013-02-252-44/+98
|\ \ | | | | | | Custom dependency trackers for the template digestor
| * | Register trackers on extensions, not handlersDaniel Schierbeck2013-02-201-6/+11
| | |
| * | Rename ErbTracker to ERBTrackerDaniel Schierbeck2013-02-201-2/+2
| | |
| * | Return an empty array if no tracker is foundDaniel Schierbeck2013-02-201-2/+7
| | |
| * | Use a thread safe hashDaniel Schierbeck2013-02-201-1/+3
| | |
| * | Allow registering custom dependency trackersDaniel Schierbeck2013-02-201-1/+14
| | |
| * | Extract dependency tracking from DigestorDaniel Schierbeck2013-02-202-44/+73
| | |
* | | Fix debug helper not inspecting on ExceptionBouke van der Bijl2013-02-231-1/+1
| | | | | | | | | The debug helper should inspect the object when it can't be converted to YAML, this behavior was changed in 8f8d8eb1465069e2ed9b6f2404aa9d02e785f534.
* | | Merge pull request #9334 from NARKOZ/time_tagAndrew White2013-02-211-1/+3
|\ \ \ | | | | | | | | use ISO 8601 format in time_tag helper
| * | | document setting custom datetime attribute for time_tag helperNihad Abbasov2013-02-221-0/+2
| | | |
| * | | fix time_tag helper and update tests to not rely on dynamically generated valuesNihad Abbasov2013-02-221-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Before `time_tag Date.today` will return `<time datetime="2013-02-14T00:00:00+00:00">February 14, 2013</time>`. This commit fixes time_tag helper to use RFC-3339 full-date format (Y-m-d) in datetime attribute.
* | | completes pass over the AP changelog [ci skip]Xavier Noria2013-02-211-1/+1
| | |
* | | Revert "Revert "Merge pull request #4803 from lucascaton/master""Santiago Pastorino2013-02-211-2/+2
| |/ |/| | | | | This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.
* | Use #grep to filter priority zones when a regexp is givenCarlos Antonio da Silva2013-02-211-1/+1
| |
* | Use Array Difference to calculate the zones array, instead of iteratingCarlos Antonio da Silva2013-02-211-2/+2
| | | | | | | | It's faster, and doesn't force us to dup the timezones array.
* | Revert "Merge pull request #4803 from lucascaton/master"Santiago Pastorino2013-02-201-2/+2
|/ | | | | | | | | | | | | | | This reverts commit bb842e8d2111e50b21a14b8bd6d89371a4b9cd68, reversing changes made to 40c287c7983c20c498f6a8a2ea49e9a6455347f7. This was causing issues in one of our apps we just upgraded. ActionController::RoutingError: No route matches [GET] "/images/favicon.ico" favicon_link_tag now returns '/images/favicon.ico' and in 3.2 returned '/favicon.ico' Browsers by default look for favicon.ico in the root directory Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/helpers/asset_tag_helper.rb