aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #10337 from eimermusic/fix_template_digestor_lookup"Rafael Mendonça França2013-04-251-1/+1
| | | | | | | | This reverts commit b4239622afc4f3f73808fd0c97512f3a534e07dd, reversing changes made to f99ce3c188f5dde57e2ff63e6a22363c62f0a4cd. Reason: This broke the build https://travis-ci.org/rails/rails/jobs/6629894
* 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.
* 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.
* 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
* | 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
| |
* | 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.
* | change some more merge to merge! on new hashesVipul A M2013-04-061-3/+3
| |
* | Merge pull request #9555 from tmm1/optimize-erbRafael Mendonça França2013-04-052-3/+35
|\ \ | | | | | | Optimize generated ERB to reduce method calls
| * | avoid extra method calls for appending newlinesAman Gupta2013-03-041-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before: ');@output_buffer.append= ( content_icon row[:content] );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' ');@output_buffer.append= ( spinner_img );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' </td> <td class="content"> ');@output_buffer.append= ( content_link row[:content] );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' </td> <td class="message"> '); after: ';@output_buffer.append=( content_icon row[:content] );@output_buffer.safe_append=' ';@output_buffer.append=( spinner_img );@output_buffer.safe_append=' </td> <td class="content"> ';@output_buffer.append=( content_link row[:content] );@output_buffer.safe_append=' </td> <td class="message"> ';
| * | Use ActionView::OutputBuffer#safe_append= from templatesAman Gupta2013-03-042-3/+9
| | |
* | | Fix explicit names on multiple file fieldsRyan McGeary2013-04-051-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | If a file field tag is passed the multiple option, it is turned into an array field (appending "[]"), but if the file field is passed an explicit name as an option, leave the name alone (do not append "[]"). Fixes #9830
* | | 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
| |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 10:44:04 +0000