Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Get ready to release 4.1.0.beta1 | David Heinemeier Hansson | 2013-12-17 | 1 | -1/+1 |
| | |||||
* | Fix integration test to pass same-origin verification | Jeremy Kemper | 2013-12-17 | 1 | -1/+1 |
| | |||||
* | Disable available locales checks to avoid warnings running the tests | Carlos Antonio da Silva | 2013-12-17 | 1 | -0/+3 |
| | |||||
* | Merge pull request #13255 from strzalek/bump-builder | Rafael Mendonça França | 2013-12-12 | 1 | -1/+1 |
|\ | | | | | Bump up builder | ||||
| * | More liberal builder dependency | Łukasz Strzałkowski | 2013-12-12 | 1 | -1/+1 |
| | | | | | | | | Allowing us to get 3.2.x versions if needed. | ||||
* | | Merge pull request #13284 from aayushkhandelwal11/typos_corrected | Godfrey Chan | 2013-12-11 | 1 | -1/+1 |
|\ \ | | | | | | | s/everytime/every time/ | ||||
| * | | typos rectified [ci skip] | Aayush khandelwal | 2013-12-12 | 1 | -1/+1 |
| | | | |||||
* | | | test description uses "disable" when it should be "disabled" | Waynn Lue | 2013-12-11 | 1 | -1/+1 |
| | | | |||||
* | | | value is "disabled" not "disable" | Waynn Lue | 2013-12-11 | 1 | -1/+1 |
|/ / | |||||
* / | 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 | 3 | -1/+26 |
|\ | | | | | | | | | | | | | 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 | 3 | -1/+24 |
| | | | | | | | | with a set of comma-separated objects. | ||||
* | | Label only accepts `:index` and `:namespace` attributes from the input | Andriel Nuernberg | 2013-12-05 | 5 | -2/+98 |
| | | |||||
* | | Remove the explicit order set for the initializer | Rafael Mendonça França | 2013-12-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | This will fix the regression added on b068e20b35797aa6deaa377a48c990759734f515. See tests added at ff08d31 to a better understanding about the problem | ||||
* | | Merge pull request #13189 from strzalek/retain-ap-av-dep | Jeremy Kemper | 2013-12-05 | 2 | -9/+0 |
|\ \ | | | | | | | Retain ActionPack dependency on ActionView. Fixes #12979. | ||||
| * | | Include AV::Layouts directly in AM::Base | Łukasz Strzałkowski | 2013-12-05 | 1 | -6/+0 |
| | | | | | | | | | | | | No need to do this in railtie as AM depends on AV either way | ||||
| * | | Retain ActionPack dependency on ActionView | Łukasz Strzałkowski | 2013-12-05 | 2 | -3/+0 |
| | | | |||||
* | | | Escalate missing error when :raise is true | Shota Fukumori (sora_h) | 2013-12-05 | 2 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | Added \u2028 \u2029 to json_escape | Godfrey Chan | 2013-12-04 | 2 | -1/+5 |
| | | | |||||
* | | | Use lower case letters in unicodes sequences to match the new encoder's output | Godfrey Chan | 2013-12-04 | 1 | -3/+3 |
| | | | |||||
* | | | Fixed a long-standing bug in `json_escape` that strips quotation marks | Godfrey Chan | 2013-12-04 | 1 | -0/+4 |
| | | | |||||
* | | | Added failing test for json_escape striping quotation marks | Godfrey Chan | 2013-12-04 | 1 | -0/+45 |
| | | | | | | | | | | | | Expanded test coverage for html_escape and json_escape | ||||
* | | | Fix issue where TextHelper#simple_format was calling missing 'raw' method | Mario Visic | 2013-12-05 | 2 | -0/+7 |
| | | | |||||
* | | | 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 | ||||
* | | Action Pack Variants | Łukasz Strzałkowski | 2013-12-04 | 6 | -12/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, variants in the templates will be picked up if a variant is set and there's a match. The format will be: app/views/projects/show.html.erb app/views/projects/show.html+tablet.erb app/views/projects/show.html+phone.erb If request.variant = :tablet is set, we'll automatically be rendering the html+tablet template. In the controller, we can also tailer to the variants with this syntax: class ProjectsController < ActionController::Base def show respond_to do |format| format.html do |html| @stars = @project.stars html.tablet { @notifications = @project.notifications } html.phone { @chat_heads = @project.chat_heads } end format.js format.atom end end end The variant itself is nil by default, but can be set in before filters, like so: class ApplicationController < ActionController::Base before_action do if request.user_agent =~ /iPad/ request.variant = :tablet end end end This is modeled loosely on custom mime types, but it's specifically not intended to be used together. If you're going to make a custom mime type, you don't need a variant. Variants are for variations on a single mime types. | ||||
* | | optimize string literals in erb templates | Aaron Patterson | 2013-12-03 | 1 | -2/+2 |
| | | |||||
* | | 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 | 2 | -14/+10 |
| | | | | | | | | | | | | | | | | | | 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 | 2 | -1/+3 |
| | | | | | | | | | | | | Previously the unit values were trusted leading to potential XSS vulnerabilities. Fixes: CVE-2013-6415 | ||||
* | | Only use valid mime type symbols as cache keys | Aaron Patterson | 2013-12-02 | 1 | -0/+7 |
| | | | | | | | | CVE-2013-6414 | ||||
* | | Merge pull request #13138 from gsamokovarov/remove-cattr-requires | Guillermo Iguaran | 2013-12-02 | 6 | -6/+6 |
|\ \ | | | | | | | Remove deprecated cattr_* requires | ||||
| * | | Remove deprecated cattr_* requires | Genadi Samokovarov | 2013-12-03 | 6 | -6/+6 |
| | | | |||||
* | | | Make ActionView::Tags loading tread safe | Rafael Mendonça França | 2013-12-02 | 4 | -32/+40 |
|/ / | |||||
* | | activemodel isn't a runtime dependency for actionview | Guillermo Iguaran | 2013-12-02 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #13117 from akshay-vishnoi/typo | Xavier Noria | 2013-12-02 | 2 | -2/+2 |
|\ \ | | | | | | | Typo and grammatical fixes [ci skip] | ||||
| * | | Typo and grammatical fixes [ci skip] | Akshay Vishnoi | 2013-12-02 | 2 | -2/+2 |
| | | | |||||
* | | | `ActionView::MissingTemplate` for partials includes underscore. | Yves Senn | 2013-12-02 | 4 | -4/+13 |
|/ / | | | | | | | | | | | Missing partial folder/_partial instead of folder/partial. Closes #13002. | ||||
* / | unnecessary checking of `size` with `second regex` if matched with first one | Kuldeep Aggarwal | 2013-11-27 | 1 | -2/+5 |
|/ | |||||
* | More typo fixes | Akira Matsuda | 2013-11-27 | 2 | -2/+2 |
| | |||||
* | Minor typo fixes | Akira Matsuda | 2013-11-27 | 4 | -6/+6 |
| | |||||
* | 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 |
| | |||||
* | _implied_layout_name should be private | Rafael Mendonça França | 2013-11-19 | 1 | -9/+11 |
| | |||||
* | Use the right indentation | Rafael Mendonça França | 2013-11-19 | 1 | -1/+1 |
| | |||||
* | Renderer#_render_template should be private | Rafael Mendonça França | 2013-11-19 | 1 | -7/+7 |
| | | | | Closes #12831 | ||||
* | Improve readability of sentence in partial-renderer docs [ci skip] | Mac Martine | 2013-11-19 | 1 | -1/+1 |
| | |||||
* | Use `set_backtrace` instead of `@backtrace` in ActionView error | Shimpei Makimoto | 2013-11-16 | 3 | -2/+13 |
| | |||||
* | Merge pull request #12853 from joshjordan/master | Rafael Mendonça França | 2013-11-15 | 1 | -1/+1 |
|\ | | | | | Allocate one less object using html_safe during content_tag construction | ||||
| * | Allocate one less object using html_safe during content_tag construction | Josh Jordan | 2013-11-14 | 1 | -1/+1 |
| | |