aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8236 from marcandre/use_divXavier Noria2012-11-162-4/+12
|\ | | | | Use div
| * Simplify (and optimize)Marc-Andre Lafortune2012-11-161-3/+3
| |
| * Use Integer#div instead of Integer#/ to avoid side effects from mathnMarc-Andre Lafortune2012-11-162-1/+9
| |
* | Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintextJosé Valim2012-11-163-1/+27
|\ \ | |/ |/| Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`
| * 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
|
* Add docs for CachingKeyGeneratorSantiago Pastorino2012-11-151-0/+6
|
* Add nodoc to DummyKeyGenerator since it's a private thingSantiago Pastorino2012-11-151-1/+1
|
* arel columns can be used for grouping so that "weird" column names are usableAaron Patterson2012-11-153-0/+11
|
* stop hardcoding FrontBase adapter conditionalsAaron Patterson2012-11-151-1/+1
|
* stop passing *args to generate aliasesAaron Patterson2012-11-151-4/+2
|
* create fewer relation objectsAaron Patterson2012-11-151-3/+6
|
* Merge pull request #8112 from rails/encrypted_cookiesSantiago Pastorino2012-11-1527-92/+321
|\ | | | | 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-0312-23/+23
| |
| * Move ensure_secret_secure to DummyKeyGeneratorSantiago Pastorino2012-11-033-25/+25
| |
| * Cache generated keys per KeyGenerator instance using salt + key_sizeSantiago Pastorino2012-11-032-5/+22
| |
| * Allow users to change the default salt if they want, shouldn't be necessarySantiago Pastorino2012-11-035-21/+48
| |
| * Use derived keys everywhere, http_authentication was missing itSantiago Pastorino2012-11-037-31/+14
| |
| * Add encrypted cookie storeSantiago Pastorino2012-11-035-9/+78
| |
| * Add cookie.encrypted which returns an EncryptedCookieJarSantiago Pastorino2012-11-034-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.1Santiago Pastorino2012-11-031-9/+17
| |
| * Sign cookies using key deriverSantiago Pastorino2012-11-0315-41/+95
| |
* | Merge pull request #8219 from nikitug/threadsafe_xmlmini_with_backendRafael Mendonça França2012-11-153-9/+104
|\ \ | | | | | | | | | | | | | | | | | | Make XmlMini.with_backend usable with threads Conflicts: activesupport/CHANGELOG.md
| * | Make XmlMini.with_backend usable with threadsNikita Afanasenko2012-11-153-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 Noria2012-11-153-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_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
| | |
* | | dependencies no longer trigger Kernel#autoload in remove_const [fixes #8213]Xavier Noria2012-11-154-13/+44
| | |
* | | Merge pull request #8216 from trevorturk/masterRafael Mendonça França2012-11-145-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 testsTrevor Turk2012-11-145-2/+52
| | | |
* | | | 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
* | | | asset compilation should not require a database connectionAaron Patterson2012-11-131-0/+26
| | | |
* | | | 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
| | | |
* | | | Merge pull request #8169 from nicolasdespres/robust_git_repository_checkRafael Mendonça França2012-11-133-1/+32
|\ \ \ \ | | | | | | | | | | Rake test:uncommitted finds git directory in ancestors.
| * | | | Add ChangeLog entry.Nicolas Despres2012-11-131-0/+2
| | | | |
| * | | | Rake test:uncommitted finds git directory in ancestors.Nicolas Despres2012-11-102-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes your git directory is an ancestor of your application root directory. For example: ./repo/.git/ ./repo/app/Rakefile In this case rake test:uncommitted will be unable to detect your SCM. This patch fixes this and add a test.
* | | | | backporting Struct#to_h from ruby 2.0Aaron Patterson2012-11-132-0/+16
| | | | |
* | | | | Assert the query result instead of checking for nothing raisedCarlos Antonio da Silva2012-11-131-4/+2
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Nothing should be raised anyway :smile: Thanks @spastorino :heart: https://github.com/rails/rails/pull/8202/files#r2112067
* | | | Merge pull request #8202 from nikitug/regression_test_on_dynamic_finder_resultCarlos Antonio da Silva2012-11-132-0/+13
|\ \ \ \ | | | | | | | | | | Regression test for #7238
| * | | | Regression test for #7238Nikita Afanasenko2012-11-132-0/+13
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 11:23:26 +0000