Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove duplicated get /foo/write_session | Santiago Pastorino | 2012-11-16 | 1 | -1/+0 |
| | |||||
* | Remove unused config option | Santiago Pastorino | 2012-11-16 | 1 | -1/+0 |
| | |||||
* | Merge pull request #8234 from kentaro/bundler-1.2.2 | Rafael Mendonça França | 2012-11-16 | 1 | -1/+1 |
|\ | | | | | Updated dependency on bundler to ~> 1.2.2 | ||||
| * | Depend bundler from `=> 1.2.2` to `< 2.0` | Kentaro Kuribayashi | 2012-11-16 | 1 | -1/+1 |
| | | |||||
| * | Updated dependency for bundler to ~> 1.2.2 | Kentaro Kuribayashi | 2012-11-16 | 1 | -1/+1 |
| | | |||||
* | | Move changelog entry from #8235 to the top [ci skip] | Carlos Antonio da Silva | 2012-11-16 | 1 | -7/+7 |
| | | |||||
* | | Remove config.threadsafe! from production env template | Carlos Antonio da Silva | 2012-11-16 | 1 | -3/+0 |
| | | | | | | | | Closes #8232 [ci skip] | ||||
* | | Refactor url methods a bit | Carlos Antonio da Silva | 2012-11-16 | 1 | -9/+9 |
| | | | | | | | | | | | | Use if..else conditions instead of return guards. Use _ for not used arguments when iterating. Set the path variable directly instead of using an empty string and <<. | ||||
* | | Fix failing template tests | Carlos Antonio da Silva | 2012-11-16 | 1 | -2/+2 |
| | | | | | | | | Introduced in 4a4de567b45ff28035419bc2d92f9b206e3c0a66. | ||||
* | | Merge pull request #8236 from marcandre/use_div | Xavier Noria | 2012-11-16 | 2 | -4/+12 |
|\ \ | | | | | | | Use div | ||||
| * | | Simplify (and optimize) | Marc-Andre Lafortune | 2012-11-16 | 1 | -3/+3 |
| | | | |||||
| * | | Use Integer#div instead of Integer#/ to avoid side effects from mathn | Marc-Andre Lafortune | 2012-11-16 | 2 | -1/+9 |
| |/ | |||||
* | | Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintext | José Valim | 2012-11-16 | 3 | -1/+27 |
|\ \ | |/ |/| | Introduce `ActionView::Template::Handlers::ERB.escape_whitelist` | ||||
| * | Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`. | Joost Baaij | 2012-11-16 | 3 | -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 whitespace | Santiago Pastorino | 2012-11-15 | 1 | -1/+1 |
| | |||||
* | Add docs for CachingKeyGenerator | Santiago Pastorino | 2012-11-15 | 1 | -0/+6 |
| | |||||
* | Add nodoc to DummyKeyGenerator since it's a private thing | Santiago Pastorino | 2012-11-15 | 1 | -1/+1 |
| | |||||
* | arel columns can be used for grouping so that "weird" column names are usable | Aaron Patterson | 2012-11-15 | 3 | -0/+11 |
| | |||||
* | stop hardcoding FrontBase adapter conditionals | Aaron Patterson | 2012-11-15 | 1 | -1/+1 |
| | |||||
* | stop passing *args to generate aliases | Aaron Patterson | 2012-11-15 | 1 | -4/+2 |
| | |||||
* | create fewer relation objects | Aaron Patterson | 2012-11-15 | 1 | -3/+6 |
| | |||||
* | Merge pull request #8112 from rails/encrypted_cookies | Santiago Pastorino | 2012-11-15 | 27 | -92/+321 |
|\ | | | | | Encrypted cookies | ||||
| * | Disallow ability to use EncryptedCookieJar with DummyKeyGenerator | Santiago Pastorino | 2012-11-03 | 1 | -0/+5 |
| | | | | | | | | | | Developers must set config.secret_key_base in config/initializers/secret_token.rb | ||||
| * | Rename secret_token_key to secret_key_base | Santiago Pastorino | 2012-11-03 | 12 | -23/+23 |
| | | |||||
| * | Move ensure_secret_secure to DummyKeyGenerator | Santiago Pastorino | 2012-11-03 | 3 | -25/+25 |
| | | |||||
| * | Cache generated keys per KeyGenerator instance using salt + key_size | Santiago Pastorino | 2012-11-03 | 2 | -5/+22 |
| | | |||||
| * | Allow users to change the default salt if they want, shouldn't be necessary | Santiago Pastorino | 2012-11-03 | 5 | -21/+48 |
| | | |||||
| * | Use derived keys everywhere, http_authentication was missing it | Santiago Pastorino | 2012-11-03 | 7 | -31/+14 |
| | | |||||
| * | Add encrypted cookie store | Santiago Pastorino | 2012-11-03 | 5 | -9/+78 |
| | | |||||
| * | Add cookie.encrypted which returns an EncryptedCookieJar | Santiago Pastorino | 2012-11-03 | 4 | -3/+69 |
| | | | | | | | | | | | | | | | | | | How to use it? cookies.encrypted[:discount] = 45 => Set-Cookie: discount=ZS9ZZ1R4cG1pcUJ1bm80anhQang3dz09LS1mbDZDSU5scGdOT3ltQ2dTdlhSdWpRPT0%3D--ab54663c9f4e3bc340c790d6d2b71e92f5b60315; path=/ cookies.encrypted[:discount] => 45 | ||||
| * | Warn config.derive_keys will be true by default in 4.1 | Santiago Pastorino | 2012-11-03 | 1 | -9/+17 |
| | | |||||
| * | Sign cookies using key deriver | Santiago Pastorino | 2012-11-03 | 15 | -41/+95 |
| | | |||||
* | | Merge pull request #8219 from nikitug/threadsafe_xmlmini_with_backend | Rafael Mendonça França | 2012-11-15 | 3 | -9/+104 |
|\ \ | | | | | | | | | | | | | | | | | | | Make XmlMini.with_backend usable with threads Conflicts: activesupport/CHANGELOG.md | ||||
| * | | Make XmlMini.with_backend usable with threads | Nikita Afanasenko | 2012-11-15 | 3 | -9/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `XmlMini.with_backend` now may be safely used with threads: Thread.new do XmlMini.with_backend("REXML") { rexml_power } end Thread.new do XmlMini.with_backend("LibXML") { libxml_power } end Each thread will use it's own backend. | ||||
* | | | let remove_constant still delete Kernel#autoload constants [rounds #8213] | Xavier Noria | 2012-11-15 | 3 | -13/+25 |
|/ / | | | | | | | | | The method #remove_const does not load the file, so we can still remove the constant. | ||||
* | | Merge pull request #8222 from marcandre/avoid_slash | Rafael Mendonça França | 2012-11-14 | 2 | -1/+6 |
|\ \ | | | | | | | Avoid using Integer#/, as it is redefined by the 'mathn' stdlib | ||||
| * | | Avoid using Integer#/, as it is redefined by the 'mathn' stdlib | Marc-Andre Lafortune | 2012-11-14 | 2 | -1/+6 |
| | | | |||||
* | | | dependencies no longer trigger Kernel#autoload in remove_const [fixes #8213] | Xavier Noria | 2012-11-15 | 4 | -13/+44 |
| | | | |||||
* | | | Merge pull request #8216 from trevorturk/master | Rafael Mendonça França | 2012-11-14 | 5 | -2/+52 |
|\ \ \ | | | | | | | | | Use BCrypt's MIN_COST in the test environment for speedier tests | ||||
| * | | | Use BCrypt's MIN_COST in the test environment for speedier tests | Trevor Turk | 2012-11-14 | 5 | -2/+52 |
| | | | | |||||
* | | | | Merge pull request #8218 from DawidJanczak/form-tag-doc | Carlos Antonio da Silva | 2012-11-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Correct examples for form_tag helper. Conflicts: actionpack/lib/action_view/helpers/form_tag_helper.rb | ||||
* | | | | asset compilation should not require a database connection | Aaron Patterson | 2012-11-13 | 1 | -0/+26 |
| | | | | |||||
* | | | | lazily calculate name in the options object | Aaron Patterson | 2012-11-13 | 1 | -14/+18 |
| | | | | |||||
* | | | | move include calculation to include method on the options object | Aaron Patterson | 2012-11-13 | 1 | -9/+24 |
| | | | | |||||
* | | | | model name is lazily evaluated in the options object | Aaron Patterson | 2012-11-13 | 1 | -27/+37 |
| | | | | |||||
* | | | | move the controller class to the options object | Aaron Patterson | 2012-11-13 | 1 | -9/+12 |
| | | | | |||||
* | | | | attribute_names will always return a list, so just use any? | Aaron Patterson | 2012-11-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | wrap up hash conversion in the constructor | Aaron Patterson | 2012-11-13 | 1 | -5/+5 |
| | | | | |||||
* | | | | use the options object in the wrapper defaults | Aaron Patterson | 2012-11-13 | 1 | -13/+12 |
| | | | | |||||
* | | | | start using options object | Aaron Patterson | 2012-11-13 | 2 | -10/+21 |
| | | | |