Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10446 from dasch/instrument-template-compilation | Rafael Mendonça França | 2013-05-06 | 1 | -2/+9 |
|\ | | | | | Instrument template compilation | ||||
| * | Instrument template compilation | Daniel Schierbeck | 2013-05-06 | 1 | -2/+9 |
| | | |||||
* | | remove unused variable | Vipul A M | 2013-05-06 | 1 | -1/+0 |
| | | |||||
* | | Fix typo in documentation comment | Junya Ogura | 2013-05-06 | 1 | -1/+1 |
| | | |||||
* | | Added missing `require` to ActionView::LookupContext | Vladimir Strakhov | 2013-05-05 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-01 | 1 | -1/+1 |
|\ | |||||
| * | fixed typo in select_tag docs | Rncrtr | 2013-04-18 | 1 | -1/+1 |
| | | |||||
* | | Revert "Merge pull request #10337 from eimermusic/fix_template_digestor_lookup" | Rafael Mendonça França | 2013-04-25 | 1 | -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 LookupContext | Martin Westin | 2013-04-25 | 1 | -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_method | Rafael Mendonça França | 2013-04-19 | 1 | -1/+1 |
|\ \ | | | | | | | symbolize_keys => symbolize_keys! on new hash; change sentence | ||||
| * | | symbolize_keys => symbolize_keys! on new hash; | Vipul A M | 2013-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | "There're" => There are for better readability | ||||
* | | | Adding documentation to actionview so that the big picture of the | wangjohn | 2013-04-18 | 4 | -0/+41 |
|/ / | | | | | | | renderer is clearer. | ||||
* | | Merge pull request #10173 from nashby/element-attributes | Rafael Mendonça França | 2013-04-16 | 1 | -1/+1 |
|\ \ | |/ |/| | options_from_collection_for_select helper takes html attributes | ||||
| * | options_from_collection_for_select helper takes html attributes | Vasiliy Ermolovich | 2013-04-11 | 1 | -1/+1 |
| | | | | | | | | as the last element of the array | ||||
* | | Fix a typo | Viktar Basharymau | 2013-04-12 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-04-11 | 36 | -78/+110 |
|\ \ | |/ |/| | | | | | Conflicts: guides/source/action_mailer_basics.md | ||||
| * | improve accuracy of simple_format documentation. span doesn't get sanitized. | RSL | 2013-04-09 | 1 | -2/+5 |
| | | |||||
| * | Typo fix | Carson McDonald | 2013-04-05 | 1 | -3/+3 |
| | | |||||
| * | fix broken format in ActionView::Helpers::AssetTagHelper [ci skip] | Francesco Rodriguez | 2013-04-04 | 1 | -4/+9 |
| | | |||||
| * | mark ActionView::Helpers::Tags as :nodoc: [ci skip] | Francesco Rodriguez | 2013-04-04 | 33 | -68/+67 |
| | | |||||
| * | fix broken format in ActionView::Helpers::NumberHelper [ci skip] | Francesco Rodriguez | 2013-04-03 | 1 | -0/+25 |
| | | |||||
| * | Fix typo | Carson McDonald | 2013-03-31 | 1 | -1/+1 |
| | | |||||
* | | Added documentation to the FormBuilder class, should help | wangjohn | 2013-04-06 | 1 | -2/+55 |
| | | | | | | | | | | clarify issue #10115. Also made the field_helpers an explicit list of methods. | ||||
* | | change some more merge to merge! on new hashes | Vipul A M | 2013-04-06 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #9555 from tmm1/optimize-erb | Rafael Mendonça França | 2013-04-05 | 2 | -3/+35 |
|\ \ | | | | | | | Optimize generated ERB to reduce method calls | ||||
| * | | avoid extra method calls for appending newlines | Aman Gupta | 2013-03-04 | 1 | -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 templates | Aman Gupta | 2013-03-04 | 2 | -3/+9 |
| | | | |||||
* | | | Fix explicit names on multiple file fields | Ryan McGeary | 2013-04-05 | 1 | -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 href | Carlos Antonio da Silva | 2013-04-04 | 1 | -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 hash | Carlos Antonio da Silva | 2013-04-04 | 1 | -3/+3 |
| | | | |||||
* | | | Add block support for the helper | Sam Pohlenz | 2013-04-03 | 1 | -5/+16 |
| | | | |||||
* | | | Fix grammatical error on JS helper warning message | thenickcox | 2013-04-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | Add changelog entry Delete changelog | ||||
* | | | typo recomend -> recommend | ogawaso | 2013-04-01 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-select | Carlos Antonio da Silva | 2013-03-31 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Revert grep to select since they are not the same | ||||
| * | | | Revert grep to select since they are not the same | Brian McManus | 2013-03-27 | 1 | -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_get | Steve Klabnik | 2013-03-31 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | remove unused variable and assignment | ||||
| * | | | | remove unused variable and assignment | Vipul A M | 2013-03-31 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* / | | | remove unused match variables in selector | Vipul A M | 2013-03-31 | 1 | -8/+8 |
|/ / / | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 2 | -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 typo | Carson McDonald | 2013-03-26 | 1 | -1/+1 |
| | | | |||||
| * | | Remove duplicated accepts_nested_attributes description | ma2gedev | 2013-03-22 | 1 | -16/+0 |
| | | | | | | | | | | | | there are just the same description about accepts_nested_attributes [ci skip] | ||||
* | | | Merge branch 'master-sec' | Aaron Patterson | 2013-03-18 | 1 | -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 Patterson | 2013-03-15 | 1 | -2/+2 |
| | | | | |||||
| * | | | fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] | Charlie Somerville | 2013-03-15 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacks | Carlos Antonio da Silva | 2013-03-18 | 1 | -1/+7 |
|\ \ \ \ | | | | | | | | | | | i18n locale fallback for localized views | ||||
| * | | | | Include I18n fallbacks in :locale lookup context | Juan Barreneche | 2013-03-16 | 1 | -1/+7 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #9754 from macksmind/fix_actionpack_warnings | Rafael Mendonça França | 2013-03-17 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | Fix rake test warnings in actionpack | ||||
| * | | | | Fix rake test warnings in actionpack | Mack Earnhardt | 2013-03-17 | 1 | -1/+2 |
| |/ / / | |||||
* / / / | Allow pass multipart option to form_for | Grzegorz Derebecki | 2013-03-17 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-10 | 1 | -1/+1 |
|\ \ \ |