aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Fix failing template testsCarlos Antonio da Silva2012-11-161-2/+2
| | | | Introduced in 4a4de567b45ff28035419bc2d92f9b206e3c0a66.
* Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`.Joost Baaij2012-11-163-1/+27
| | | | | | | | | | | This is a list of mime types where template text is not html escaped by default. It prevents `Jack & Joe` from rendering as `Jack & Joe` for the whitelisted mime types. The default whitelist contains text/plain. This follows a whitelist approach where plain text templates are not escaped, and all the others (json, xml) are. The mime type is assumed to be set by the abstract controller.
* Remove extra whitespaceSantiago Pastorino2012-11-151-1/+1
|
* Merge pull request #8112 from rails/encrypted_cookiesSantiago Pastorino2012-11-1510-56/+149
|\ | | | | Encrypted cookies
| * Disallow ability to use EncryptedCookieJar with DummyKeyGeneratorSantiago Pastorino2012-11-031-0/+5
| | | | | | | | | | Developers must set config.secret_key_base in config/initializers/secret_token.rb
| * Rename secret_token_key to secret_key_baseSantiago Pastorino2012-11-031-3/+3
| |
| * Move ensure_secret_secure to DummyKeyGeneratorSantiago Pastorino2012-11-032-25/+1
| |
| * Allow users to change the default salt if they want, shouldn't be necessarySantiago Pastorino2012-11-034-14/+33
| |
| * Use derived keys everywhere, http_authentication was missing itSantiago Pastorino2012-11-032-4/+5
| |
| * Add encrypted cookie storeSantiago Pastorino2012-11-032-7/+25
| |
| * Add cookie.encrypted which returns an EncryptedCookieJarSantiago Pastorino2012-11-032-0/+63
| | | | | | | | | | | | | | | | | | How to use it? cookies.encrypted[:discount] = 45 => Set-Cookie: discount=ZS9ZZ1R4cG1pcUJ1bm80anhQang3dz09LS1mbDZDSU5scGdOT3ltQ2dTdlhSdWpRPT0%3D--ab54663c9f4e3bc340c790d6d2b71e92f5b60315; path=/ cookies.encrypted[:discount] => 45
| * Sign cookies using key deriverSantiago Pastorino2012-11-035-28/+39
| |
* | Merge pull request #8222 from marcandre/avoid_slashRafael Mendonça França2012-11-142-1/+6
|\ \ | | | | | | Avoid using Integer#/, as it is redefined by the 'mathn' stdlib
| * | Avoid using Integer#/, as it is redefined by the 'mathn' stdlibMarc-Andre Lafortune2012-11-142-1/+6
| | |
* | | Merge pull request #8218 from DawidJanczak/form-tag-docCarlos Antonio da Silva2012-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | [ci skip] Correct examples for form_tag helper. Conflicts: actionpack/lib/action_view/helpers/form_tag_helper.rb
* | | lazily calculate name in the options objectAaron Patterson2012-11-131-14/+18
| | |
* | | move include calculation to include method on the options objectAaron Patterson2012-11-131-9/+24
| | |
* | | model name is lazily evaluated in the options objectAaron Patterson2012-11-131-27/+37
| | |
* | | move the controller class to the options objectAaron Patterson2012-11-131-9/+12
| | |
* | | attribute_names will always return a list, so just use any?Aaron Patterson2012-11-131-1/+1
| | |
* | | wrap up hash conversion in the constructorAaron Patterson2012-11-131-5/+5
| | |
* | | use the options object in the wrapper defaultsAaron Patterson2012-11-131-13/+12
| | |
* | | start using options objectAaron Patterson2012-11-132-10/+21
| | |
* | | only do hash lookups on options onceAaron Patterson2012-11-131-13/+15
| | |
* | | replace present? with any? to reduce dependency on ASAaron Patterson2012-11-132-1/+2
| | |
* | | Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag ↵Aaron Patterson2012-11-121-0/+1
|/ / | | | | | | this file with us-ascii
* | Use get in the redirection doc examplesCarlos Antonio da Silva2012-11-091-7/+7
| | | | | | | | | | | | | | get is the most common usage, and match without an explicit verb was disallowed in 56cdc81c08b1847c5c1f699810a8c3b9ac3715a6. [ci skip]
* | Merge pull request #8158 from steveklabnik/deprecate_diffCarlos Antonio da Silva2012-11-091-3/+1
|\ \ | | | | | | Deprecate Hash#diff.
| * | Deprecate Hash#diff.Steve Klabnik2012-11-091-3/+1
| | | | | | | | | | | | | | | | | | It's no longer used in Rails any more. See https://github.com/rails/rails/pull/8142\#issuecomment-10227297 for more
* | | Removing duplication in callback normalization.Steve Klabnik2012-11-091-7/+8
|/ / | | | | | | These two things were 100% identical.
* | Merge pull request #8151 from nashby/forwardableCarlos Antonio da Silva2012-11-091-20/+2
|\ \ | | | | | | delegate PathSet's enumerator methods
| * | delegate PathSet's enumerator methodsVasiliy Ermolovich2012-11-091-20/+2
| | |
* | | Fix message about include_blank option.Steve Klabnik + Katrina Owen2012-11-091-1/+1
| | | | | | | | | | | | | | | See https://github.com/rails/rails/commit/cb7d19b66badfbd1846c195913419c331701074e#commitcomment-2127148.
* | | implement to_a and to_ary so that the Array() call in template.rb willAaron Patterson2012-11-091-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not raise so many exceptions: https://github.com/rails/rails/blob/master/actionpack/lib/action_view/template.rb#L126 irb(main):001:0> class Foo; def method_missing(*args); super; end end => nil irb(main):002:0> $DEBUG = true => true irb(main):003:0> Array(Foo.new) Exception `NoMethodError' at (irb):1 - undefined method `to_ary' for #<Foo:0x007f854390e488> Exception `NoMethodError' at (irb):1 - undefined method `to_a' for #<Foo:0x007f854390e488> => [#<Foo:0x007f854390e488>] irb(main):004:0>
* | | Merge pull request #8147 from gbchaosmaster/gemspecRafael Mendonça França2012-11-081-13/+15
|\ \ \ | | | | | | | | Reformat gemspec
| * | | Clean up gemspecsVinny Diehl2012-11-081-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Organized the gemspec files a bit. * Made quotes more consistent (single quotes dominated, so I used that). * Moved license line down a line, separating it logically, and removed the extra whitespace before its = operator. * Minor whitespace fixes.
* | | | Revert "Merge pull request #8017 from jcoglan/objectless_sessions"Jon Leighton2012-11-093-47/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 36376560fdd02f955ae3bf6b7792b784443660ad, reversing changes made to 3148ed9a4bb7efef30b846dc945d73ceebcc3f0f. Conflicts: actionpack/lib/action_dispatch/middleware/flash.rb Reason: it broke Sam's CI https://github.com/rails/rails/pull/8017#issuecomment-10210655
* | | | Remove free usage of #tapCarlos Antonio da Silva2012-11-081-3/+4
| | | |
* | | | Merge pull request #8017 from jcoglan/objectless_sessionsJon Leighton2012-11-083-10/+46
|\ \ \ \ | | | | | | | | | | Store FlashHashes in the session as plain hashes
| * | | | Store FlashHashes in the session as plain hashes rather than custom objects ↵James Coglan2012-11-033-10/+46
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with unstable class names and instance variables. Refactor FlashHash to take values for its ivars in the constructor, to pretty up FlashHash.from_session_value. Remove stale comment on FlashHash: it is no longer Marshaled in the session so we can change its implementation. Remove blank lines I introduced in controller/test_case.rb. Unit tests for FlashHash#to_session_value. Put in a compatibility layer to accept FlashHash serializations from Rails 3.0+. Test that Rails 3.2 session flashes are correctly converted to the new format. Remove code path for processing Rails 3.0 FlashHashes since they can no longer deserialize.
* | | | Merge pull request #8115 from senny/7842_handle_trailing_slash_with_enginesRafael Mendonça França2012-11-082-3/+6
|\ \ \ \ | |_|/ / |/| | | handle trailing slash with engines (test case for #7842)
| * | | routing prefix slash replacement is no longer necessaryYves Senn2012-11-041-3/+1
| | | |
| * | | test case to lock down the behavior of #7842Yves Senn2012-11-041-0/+5
| | | |
* | | | Add CHANGELOG entry for #8108 on master too.Rafael Mendonça França2012-11-081-0/+16
| |_|/ |/| | | | | | | | [ci skip]
* | | Set @permitted on new instance when slicing parameters hashBenjamin Quorning2012-11-061-1/+3
| | |
* | | Test that permitted? is sticky on accessors, mutators, and mergesBenjamin Quorning2012-11-061-0/+24
| | |
* | | Test that not permitted is sticky on #exceptBenjamin Quorning2012-11-061-0/+1
| | |
* | | Current tests are testing stickiness of non-permitted parametersBenjamin Quorning2012-11-061-3/+3
| | |
* | | Fix buggy testsBenjamin Quorning2012-11-061-4/+4
| | |
* | | Add ensure block to make sure the state is properly restoredCarlos Antonio da Silva2012-11-042-2/+2
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 02:32:56 +0000