aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
* use `_action` instead of `_filter` callbacksFrancesco Rodriguez2012-12-071-2/+2
|
* Revert "Invert precedence of content in ActionDispatch::Static"Andrew White2012-12-071-11/+7
| | | | This reverts commit c59734f756b79c39486c45273d2cc5d42cd0c864.
* Invert precedence of content in ActionDispatch::StaticAndrew White2012-12-061-7/+11
| | | | | | | | | | This commit inverts the precedence in ActionDispatch::Static so that dynamic content will be served before static content. This is so that precompiled assets do not inadvertently get included when running in development mode - it should have no effect in production where static files are usually handled by the web server. Closes #6421
* Merge pull request #8412 from ↵Rafael Mendonça França2012-12-051-18/+14
|\ | | | | | | | | JoeyButler/action_dispatch_routing_mapper_refactoring Extract method refactoring.
| * Extract method refactoring in ActionDispatch::Routing::SingletonResource.Joey Butler2012-12-051-18/+14
| |
* | Adding filter capability to ActionController logsFabrizio Regini2012-12-052-0/+38
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-046-14/+2
|\ \ | | | | | | | | | | | | Conflicts: guides/source/migrations.md
| * | Remove nodoc from FlashHash #[]= [ci skip]Pablo Torres2012-12-011-1/+1
| | |
| * | Cleans and removes 'Examples' tag [ci skip]Alvaro Pereyra2012-12-011-2/+0
| | |
| * | Cleans and removes useless 'Examples' tag [ci skip]Alvaro Pereyra2012-12-013-10/+0
| | |
| * | Revert "Remove trailing whitespaces"Florent Guilleux2012-12-011-1/+1
| | | | | | | | | | | | This reverts commit 90c887fa7d0c454b7533e208daefc342dea4d5f3.
| * | Remove trailing whitespacesFlorent Guilleux2012-12-011-1/+1
| | |
| * | nodoc AD & AV railties classesCarlos Duclos2012-12-011-1/+1
| |/
* / Fixed issue where routes with globs caused constraints on that glob toMaura Fitzgerald2012-12-041-1/+1
|/ | | | | | be ignored. A regular expression constraint gets overwritten when the routes.rb file is processed. Changed the overwriting to an ||= instead of an = assignment.
* Use File.join to better integrate fixture_path in fixture_file_upload.Ben Woosley2012-11-261-5/+7
|
* Refector a bit to remove extra slice iteration and splat callCarlos Antonio da Silva2012-11-241-2/+2
| | | | | | | | | This yields a small bit of performance improvement when building the defaults from constraints, specially considering that it's rather common for constraints to be empty. Also, there's a bit of duplicated code in here that I have to check before extracting.
* Use merge! in some places to avoid creating extra hashesCarlos Antonio da Silva2012-11-242-4/+4
|
* Simplify scope options recovery by using merge!Carlos Antonio da Silva2012-11-241-6/+1
| | | | | | Instead of iterating again over the options and setting one by one, we can just merge the recover hash back to the scope one since all keys match.
* Normalize scope recovering :blocks option nameCarlos Antonio da Silva2012-11-241-3/+3
| | | | | Use the same :blocks key in the recover hash to revert the scope options later.
* Simplify constraints condition in scope when checking for HashCarlos Antonio da Silva2012-11-241-7/+4
|
* Allow setting a symbol as path in scope on routesGuillermo Iguaran2012-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Was surprising found that this example doesn't work: scope :api do resources :users end and the right form to use it is: scope 'api' do resources :users end I think this should work similary as `namespace` where both are allowed. These two are equivalent: namespace :api do resources :users end namespace 'api' do resources :user end
* Merge pull request #8183 from jcoglan/objectless_sessionsJon Leighton2012-11-211-10/+24
|\ | | | | Store FlashHashes in the session as plain hashes
| * Store FlashHashes in the session as plain hashes rather than custom objects ↵James Coglan2012-11-091-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Fix session['flash'] deletion condition: it will never be empty?, it will either be nil or a hash with 'discard' and 'flashes' keys.
* | Correct the use of params options when given to url_forCarlos Antonio da Silva2012-11-191-1/+1
| | | | | | | | Merge url for tests and add changelog entry for #8233.
* | Fix issue with params in url_fortumayun2012-11-191-1/+1
| | | | | | | | | | | | With a "params" argument, the following error is raised: undefined method `reject!` for "":String
* | Fix UpgradeSignatureToEncryptionCookieStore docSantiago Pastorino2012-11-191-9/+4
| |
* | Removed extra call to #diff in #assert_recognizes. assert_equal calls it for ↵Ryan Davis2012-11-171-4/+7
| | | | | | | | you and shows the diff. Also delayed message calculation so the cost of the diff on success is now gone.
* | Improve UpgradeSignatureToEncryptionCookieStore docsSantiago Pastorino2012-11-161-1/+14
| | | | | | | | | | I suck at English, please help me reviewing this <3 <3 <3 [ci skip]
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-171-17/+22
|\ \ | | | | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb
| * | update syntax and add note about prompt use of HttpHelpers [ci-skip]Cesar Carruitero2012-11-091-12/+17
| | |
| * | correct link syntax [ci-skip]Cesar Carruitero2012-11-091-5/+5
| | |
| * | change rdoc syntax for adecuate render [ci-skip]Cesar Carruitero2012-11-091-1/+1
| | |
| * | change match to get and add single quotes in routing/redirection [ci-skip]Cesar Carruitero2012-11-081-8/+8
| | |
* | | Add UpgradeSignatureToEncryptionCookieStoreSantiago Pastorino2012-11-162-2/+25
| | | | | | | | | | | | | | | | | | This allows easy upgrading from the old signed Cookie Store <= 3.2 or the deprecated one in 4.0 (the ones that doesn't use key derivation) to the new one that signs using key derivation
* | | Call get_cookie to allow the method to be overriden by subclassesSantiago Pastorino2012-11-161-1/+1
| | |
* | | Add missing env param to get_cookieSantiago Pastorino2012-11-161-1/+1
| | |
* | | Refactor url methods a bitCarlos Antonio da Silva2012-11-161-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 <<.
* | | Merge pull request #8112 from rails/encrypted_cookiesSantiago Pastorino2012-11-153-34/+99
|\ \ \ | | | | | | | | 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-031-24/+0
| | | |
| * | | Allow users to change the default salt if they want, shouldn't be necessarySantiago Pastorino2012-11-032-11/+26
| | | |
| * | | Add encrypted cookie storeSantiago Pastorino2012-11-031-3/+20
| | | |
| * | | Add cookie.encrypted which returns an EncryptedCookieJarSantiago Pastorino2012-11-031-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-031-15/+19
| | |/ | |/|
* | | 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]
* | | 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
* | | 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>
* | | Revert "Merge pull request #8017 from jcoglan/objectless_sessions"Jon Leighton2012-11-091-24/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 16:58:28 +0000