Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | duplication removed(DRY) | abhishek | 2013-12-18 | 1 | -16/+10 | |
| | | | | ||||||
* | | | | allow video_tag to accept `size` as `Number` for square shaped videos | Kuldeep Aggarwal | 2013-12-18 | 1 | -4/+10 | |
| |/ / |/| | | ||||||
* | | | Fix typo in docs, missing colon in Symbol literal [ci skip] | Semyon Perepelitsa | 2013-12-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #13059 from imkmf/cycle-accepts-array | Rafael Mendonça França | 2013-12-06 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Cycle object should accept an array Conflicts: actionview/CHANGELOG.md | |||||
| * | | | A Cycle object should accept an array and cycle through it as it would | Kristian Freeman | 2013-12-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | with a set of comma-separated objects. | |||||
* | | | | Label only accepts `:index` and `:namespace` attributes from the input | Andriel Nuernberg | 2013-12-05 | 2 | -2/+1 | |
| | | | | ||||||
* | | | | Escalate missing error when :raise is true | Shota Fukumori (sora_h) | 2013-12-05 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before ec16ba75a5493b9da972eea08bae630eba35b62f, ActionView::Helpers::TranslationHelper#translate has raised errors with specifying options[:raise] to true. This should work by this fix: begin t(:"translations.missing", raise: true) rescue I18n::MissingTranslationData p :hello! end | |||||
* | | | | Fix issue where TextHelper#simple_format was calling missing 'raw' method | Mario Visic | 2013-12-05 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Fix documentation of number_to_currency helper | Rafael Mendonça França | 2013-12-04 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now users have to explicit mark the unit as safe if they trust it. Closes #13161 Conflicts: actionpack/lib/action_view/helpers/number_helper.rb actionpack/test/template/number_helper_i18n_test.rb | |||||
* | | | | Remove the escaping skip | Rafael Mendonça França | 2013-12-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | We are generating safe strings in the paragraph, so we can escape the tags | |||||
* | | | | Stop using i18n's built in HTML error handling. | Michael Koziarski | 2013-12-02 | 1 | -13/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n doesn't depend on active support which means it can't use our html_safe code to do its escaping when generating the spans. Rather than try to sanitize the output from i18n, just revert to our old behaviour of rescuing the error and constructing the tag ourselves. Fixes: CVE-2013-4491 | |||||
* | | | | Ensure simple_format escapes its html attributes | Michael Koziarski | 2013-12-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous behavior equated the sanitize option for simple_format with the escape option of content_tag, however these are two distinct concepts. This fixes CVE-2013-6416 Conflicts: actionview/lib/action_view/helpers/text_helper.rb | |||||
* | | | | Escape the unit value provided to number_to_currency | Michael Koziarski | 2013-12-02 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Previously the unit values were trusted leading to potential XSS vulnerabilities. Fixes: CVE-2013-6415 | |||||
* | | | | Merge pull request #13138 from gsamokovarov/remove-cattr-requires | Guillermo Iguaran | 2013-12-02 | 2 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | Remove deprecated cattr_* requires | |||||
| * | | | | Remove deprecated cattr_* requires | Genadi Samokovarov | 2013-12-03 | 2 | -2/+2 | |
| | | | | | ||||||
* | | | | | Make ActionView::Tags loading tread safe | Rafael Mendonça França | 2013-12-02 | 2 | -32/+33 | |
|/ / / / | ||||||
* | | | | Typo and grammatical fixes [ci skip] | Akshay Vishnoi | 2013-12-02 | 2 | -2/+2 | |
| | | | | ||||||
* | | | | unnecessary checking of `size` with `second regex` if matched with first one | Kuldeep Aggarwal | 2013-11-27 | 1 | -2/+5 | |
|/ / / | ||||||
* | | | Minor typo fixes | Akira Matsuda | 2013-11-27 | 1 | -1/+1 | |
| | | | ||||||
* | | | Revert "Merge pull request #13027 from akshay-vishnoi/f-refactor" | Carlos Antonio da Silva | 2013-11-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f4a5a9ea4d183f4102796215d4502c46dbe3e52b, reversing changes made to 7ccb482181ee6c47c765406009018a15172812de. Reason: The logic is different, the first call to #option_value_selected? is for the :selected option (the argument is the "selected" variable), the second call is for the :disabled option (the argument is the "disabled" variable). | |||||
* | | | avoiding calling of #option_value_selected? two times | Akshay Vishnoi | 2013-11-25 | 1 | -1/+1 | |
| | | | ||||||
* | | | Allocate one less object using html_safe during content_tag construction | Josh Jordan | 2013-11-14 | 1 | -1/+1 | |
| | | | ||||||
* | | | Revert "Used Yield instead of block.call" -- this causes all of ↵ | David Heinemeier Hansson | 2013-11-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | atom_feed_helper_test.rb to fail with "SystemStackError: stack level too deep". This reverts commit d3a1ce1cdc60d593de1682c5f4e3230c8db9a0fd. | |||||
* | | | Merge pull request #12889 from kuldeepaggarwal/speed_ups | Rafael Mendonça França | 2013-11-14 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | Used Yield instead of block.call | |||||
| * | | | Used Yield instead of block.call | Kuldeep Aggarwal | 2013-11-15 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Fix syntax error in atom_feed example [ci skip] | Saulius Grigaliunas | 2013-11-13 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | Builder's #tag! takes either String or Symbol as the first parameter | |||||
* | | | Make the method name the first argument | Rafael Mendonça França | 2013-11-09 | 1 | -7/+7 | |
| | | | | | | | | | | | | | | | This is the only argument that changes over the method calls so it is better to it be the first one | |||||
* | | | Merge pull request #12760 from pseidemann/master | Yves Senn | 2013-11-09 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | fix simple_format escapes own output when sanitize is set to true | |||||
| * | | | fix simple_format escapes own output when sanitize is set to true | pseidemann | 2013-11-08 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Extract common code from number helpers to new delegator method. | Vipul A M | 2013-11-09 | 1 | -30/+13 | |
| | | | | ||||||
* | | | | Merge pull request #12788 from kylefritz/patch-1 | Rafael Mendonça França | 2013-11-06 | 1 | -2/+2 | |
|/ / / | | | | | | | | | | | | | | | | rdoc: favicon source shouldn't begin with a slash to reference asset pipeline resource [ci skip] Conflicts: actionview/lib/action_view/helpers/asset_tag_helper.rb | |||||
* | | | Line up the comments for aesthetics | David Heinemeier Hansson | 2013-11-03 | 1 | -5/+5 | |
| | | | ||||||
* | | | Convert CDATA input to string before gsub'ing | Carsten Zimmermann | 2013-10-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | Rails 3.2 API allowed arbitrary input for cdata_section; this change re-introduces the old behaviour. | |||||
* | | | Remove warning of shadowing outer local variable | Rafael Mendonça França | 2013-10-27 | 1 | -2/+2 | |
| |/ |/| | ||||||
* | | Merge pull request #10471 from andyw8/button_to_params | Rafael Mendonça França | 2013-10-24 | 1 | -0/+7 | |
|\ \ | | | | | | | | | | | | | | | | | | | Add params option for button_to Conflicts: actionpack/CHANGELOG.md | |||||
| * | | Add params option for button_to | Andy Waite | 2013-09-18 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | The parameters are rendered as hidden form fields within the generated form. This is useful for when a record has multiple buttons associated with it, each of which target the same controller method, but which need to submit different attributes. | |||||
* | | | Fix typo in form_helper.rb | Adam Jahnke | 2013-10-16 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #12491 from shamanime/patch-1 | Rafael Mendonça França | 2013-10-13 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | Fix wrong variable name used in the select_day method documentation | |||||
| * | | | Fix wrong variable name used in the select_day method documentation | Jefferson Queiroz Venerando | 2013-10-10 | 1 | -2/+2 | |
| | | | | | | | | | | | | The variable name created in the example is `my_date`, the methods were using `my_time` instead. | |||||
* | | | | Change `map` to `map!` to save extra array creation on new array | Vipul A M | 2013-10-13 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Fixed return strings in documentation | Joseph Zidell | 2013-10-03 | 1 | -3/+3 | |
| | | | ||||||
* | | | Fixed typo in documentation | Joseph Zidell | 2013-10-03 | 1 | -3/+3 | |
| | | | ||||||
* | | | Use the given name in html_options for the hidden field in ↵ | Angel N. Sciortino | 2013-09-24 | 1 | -1/+2 | |
| | | | | | | | | | | | | collection_check_boxes | |||||
* | | | Merge pull request #10773 from wangjohn/link_and_routing_options | Rafael Mendonça França | 2013-09-23 | 1 | -2/+3 | |
| | | | | | | | | | | | | Adding documentation and tests to ``polymorphic_url`` and ``link_to`` | |||||
* | | | Fix some edge cases for AV `select` helper with `:selected` option | Bogdan Gusiev | 2013-09-23 | 1 | -1/+2 | |
| | | | ||||||
* | | | Expand select documentation to tell about the block | Rafael Mendonça França | 2013-09-23 | 1 | -0/+9 | |
| | | | | | | | | | | | | [ci skip] | |||||
* | | | Ability to pass block to AV#select helper | Bogdan Gusiev | 2013-09-23 | 2 | -5/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Example: = select(report, "campaign_ids") do - available_campaigns.each do |c| %option{:data => {:tags => c.tags.to_json}, :value => c.id}= c.name | |||||
* | | | handle `:namespace` form option in collection labels | Vasiliy Ermolovich | 2013-09-22 | 2 | -1/+3 | |
| | | | ||||||
* | | | Merge pull request #12112 from adamniedzielski/fix-form-for-namespace-and-as | Rafael Mendonça França | 2013-09-12 | 1 | -1/+2 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | form_for - fix :namespace and :as options clash Conflicts: actionview/CHANGELOG.md | |||||
| * | | | form_for - fix :namespace and :as options clash | Adam Niedzielski | 2013-09-09 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :as option should not overwrite :namespace option when generating html id attribute of the form element. id should be prefixed by specified namespace even if :as option is present Add test case showing the issue and code fixing it |