aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Deep Munge the parameters for GET and POSTMichael Koziarski2013-12-022-2/+17
| | | | | | | | The previous implementation of this functionality could be accidentally subverted by instantiating a raw Rack::Request before the first Rails::Request was constructed. Fixes CVE-2013-6417
* Stop using i18n's built in HTML error handling.Michael Koziarski2013-12-022-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 attributesMichael Koziarski2013-12-021-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_currencyMichael Koziarski2013-12-022-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 keysAaron Patterson2013-12-021-0/+7
| | | | CVE-2013-6414
* Merge remote-tracking branch 'origin/master'Rafael Mendonça França2013-12-0218-21/+41
|\
| * Merge pull request #12123 from aredondo/masterCarlos Antonio da Silva2013-12-021-0/+8
| |\ | | | | | | | | | | | | Add regression test for IpSpoofAttackError issue Closes #10780
| | * Add regression test for IpSpoofAttackError issueAlvaro Redondo2013-09-031-0/+8
| | | | | | | | | | | | See #10780
| * | Remove note about removed local_constant_names method from guides [ci skip]Carlos Antonio da Silva2013-12-021-1/+1
| | |
| * | Remove dead comment from AS extensions guide [ci skip]Carlos Antonio da Silva2013-12-021-2/+0
| | |
| * | Fix note about class attribute accessors deprecated file [ci skip]Carlos Antonio da Silva2013-12-021-1/+1
| | |
| * | Merge pull request #13138 from gsamokovarov/remove-cattr-requiresGuillermo Iguaran2013-12-0215-15/+15
| |\ \ | | | | | | | | Remove deprecated cattr_* requires
| | * | Remove deprecated cattr_* requiresGenadi Samokovarov2013-12-0315-15/+15
| | | |
| * | | Add number and range field to form helpers articleJuanito Fatas2013-12-021-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | Also wrap surrounding text to 80 chars. [ci skip] Closes #13132
* | | | :sicssors:Rafael Mendonça França2013-12-028-15/+2
| | | |
* | | | Options are not optionalRafael Mendonça França2013-12-021-2/+2
| | | |
* | | | Make execute priave APIRafael Mendonça França2013-12-027-12/+16
| | | |
* | | | Make load of NumberHelper thread safeRafael Mendonça França2013-12-029-26/+18
| | | |
* | | | Merge pull request #10996 from mattdbridges/number-helper-refactorRafael Mendonça França2013-12-0210-312/+533
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Refactor and clean up number helpers Conflicts: activesupport/lib/active_support/number_helper.rb
| * | | Extract ActiveSupport::NumberHelper methods to classesMatt Bridges2013-07-0110-314/+533
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the overall complexity of each method individually as well as the global shared private module methods, this pulls each helper into it's own converter class inheriting from a generic `NumberBuilder` class. * The `NumberBuilder` class contains the private methods needed for each helper method an eliminates the need for special definition of specialized private module methods. * The `ActiveSupport::NumberHelper::DEFAULTS` constant has been moved into the `NumberBuilder` class because the `NumberBuilder` is the only class which needs access to it. * For each of the builders, the `#convert` method is broken down to smaller parts and extracted into private methods for clarity of purpose. * Most of the mutation that once was necessary has now been eliminated. * Several of the mathematical operations for percentage, delimited, and rounded have been moved into private methods to ease readability and clarity. * Internationalization is still a bit crufty, and definitely could be improved, but it is functional and a bit easier to follow. The following helpers were extracted into their respective classes. * `#number_to_percentage` -> `NumberToPercentageConverter` * `#number_to_delimited` -> `NumberToDelimitedConverter` * `#number_to_phone` -> `NumberToPhoneConverter` * `#number_to_currency` -> `NumberToCurrencyConverter` * `#number_to_rounded` -> `NumberToRoundedConverter` * `#number_to_human_size` -> `NumberToHumanSizeConverter` * `#number_to_human` -> `NumberToHumanConverter`
* | | | Make ActionView::Tags loading tread safeRafael Mendonça França2013-12-024-32/+40
| |/ / |/| |
* | | Merge pull request #11197 from gsamokovarov/unify-mattr-cattrGuillermo Iguaran2013-12-027-271/+196
|\ \ \ | | | | | | | | Unify cattr and mattr accessors declarations
| * | | Unify cattr and mattr accessors declarationsGenadi Samokovarov2013-12-027-271/+196
| | | |
* | | | Wrap 80 columns [ci skip]Rafael Mendonça França2013-12-021-5/+10
| | | |
* | | | Add documentation about the Action Dispatch salt configurationRafael Mendonça França2013-12-021-0/+8
| | | | | | | | | | | | | | | | [ci skip]
* | | | Use alphabetic orderRafael Mendonça França2013-12-021-2/+2
| | | | | | | | | | | | | | | | [ci skip]
* | | | :scissors:Rafael Mendonça França2013-12-022-5/+5
| | | | | | | | | | | | | | | | [ci skip]
* | | | Make the release notes consistent [ci skip]Rafael Mendonça França2013-12-021-66/+66
| | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md
* | | | Make the tests break againRafael Mendonça França2013-12-021-2/+0
|/ / / | | | | | | | | | We need to fix this test
* | | activemodel isn't a runtime dependency for actionviewGuillermo Iguaran2013-12-021-2/+2
| | |
* | | Merge pull request #13134 from rubiii/patch-1Carlos Antonio da Silva2013-12-021-0/+1
|\ \ \ | | | | | | | | added missing require to active_support/tagged_logging
| * | | added missing requireDaniel Harrington2013-12-021-0/+1
|/ / / | | | | | | we’re using .delegate and should require it.
* | | `mail()` without arguments is a getter for the current mail.Yves Senn2013-12-023-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior is documented in our guides (http://edgeguides.rubyonrails.org/action_mailer_basics.html#action-mailer-callbacks) but was broken in the past. This commit short curcuits the `mail` method if: 1. mail() was previously called 2. no headers are passed 3. no block is passed Closes #13090. /cc @pixeltrix
* | | Merge pull request #13117 from akshay-vishnoi/typoXavier Noria2013-12-028-12/+12
|\ \ \ | | | | | | | | Typo and grammatical fixes [ci skip]
| * | | Typo and grammatical fixes [ci skip]Akshay Vishnoi2013-12-028-12/+12
| | | |
* | | | Merge pull request #11466 from jetthoughts/updated_tesing_guidesYves Senn2013-12-021-9/+14
|\ \ \ \ | | | | | | | | | | Fix `rake test` description in the guides [ci skip]
| * | | | Add `rake test:all`, `rake test:all:db` to guidePaul Nikitochkin2013-11-301-9/+14
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | `ActionView::MissingTemplate` for partials includes underscore.Yves Senn2013-12-024-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing partial folder/_partial instead of folder/partial. Closes #13002.
* | | | | Merge pull request #12365 from jbaudanza/reorderGuillermo Iguaran2013-12-012-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Move Rack::Cache after ActionDispatch::Static in the middleware stack
| * | | | | Move Rack::Cache after AD::Static in the stackJonathan Baudanza2013-09-252-6/+6
| | | | | |
* | | | | | Update active_record_querying.mdGuillermo Iguaran2013-12-021-1/+1
| | | | | | | | | | | | | | | | | | he or she => they
* | | | | | Cleanups in API docs: his => theirGuillermo Iguaran2013-12-021-2/+2
| | | | | |
* | | | | | Try to escape each part of a path redirect route correctlyAndrew White2013-12-023-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A path redirect may contain any and all parts of a url which have different escaping rules for each part. This commit tries to escape each part correctly by splitting the string into three chunks - path (which may also include a host), query and fragment; then it applies the correct escape pattern to each part. Whilst using `URI.parse` would be better, unfortunately the possible presence of %{name} parameters in the path redirect string prevents us from using it so we have to use a regular expression instead. Fixes #13110.
* | | | | | Merge pull request #13130 from gja/masterGuillermo Iguaran2013-12-013-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removing some gender sensitive object pronouns
| * | | | | | [ci skip] Removing some gender sensitive object pronounsTejas Dinkar2013-12-023-9/+9
| | | | | | |
* | | | | | | Add examples for gender neutral pronounsGuillermo Iguaran2013-12-011-1/+7
| | | | | | |
* | | | | | | Update API docs guidelines with reference about gender neutral pronounsGuillermo Iguaran2013-12-011-0/+2
|/ / / / / /
* | | | | | Merge pull request #13126 from vipulnsward/gender_neutral_pronounsAndrew White2013-12-011-18/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use gender - neutral pronouns in security guide.
| * | | | | | Use genderless pronouns in security guide. [ci skip]Vipul A M2013-12-021-18/+18
|/ / / / / / | | | | | | | | | | | | | | | | | | related #49ff20d9b164693ed7fee880b69cc14b141678b3
* | | | | | Merge pull request #10712 from prathamesh-sonpatki/plugin-railsrcGuillermo Iguaran2013-12-012-0/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use .railsrc while creating new plugin if available. Fixes #10700