aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-021-6/+6
|\ \ \
| * | | Fix name of parent resource params when declaring nested resources at routesCarlos Paramio2011-09-011-6/+6
| | | |
* | | | CookieJar is enumerable. fixes #2795Aaron Patterson2011-09-011-0/+5
| | | |
* | | | Merge pull request #2718 from dasch/patch-5Vijay Dev2011-09-011-1/+4
|\ \ \ \ | |/ / / |/| | | Split long string into multiple shorter ones
| * | | Split long string into multiple shorter ones Daniel Schierbeck2011-08-291-1/+4
| | | | | | | | | | | | This makes the code more readable.
* | | | Refactor ActionDispatch::Http::UploadedFileDaniel Schierbeck2011-08-281-14/+3
|/ / /
* | | doc fixesVijay Dev2011-08-281-4/+8
| | |
* | | stop circular require warningsAaron Patterson2011-08-241-1/+0
|/ /
* | We actually don't need a reverse_merge! here. dup removed was giving error ↵Arun Agrawal2011-08-121-1/+1
| | | | | | | | with nil class.
* | when calling url_for with a hash, additional (likely unwanted) values (such ↵Andrew Kaspick2011-08-111-1/+1
|/ | | | as :host) would be returned in the hash... calling #dup on the hash prevents this
* x_sendfile_header now defaults to nil and production.rb env file doesn'tSantiago Pastorino2011-08-071-1/+1
| | | | | | | set a particular value for it. This allows servers to set it through X-Sendfile-Type, read https://github.com/rack/rack/blob/master/lib/rack/sendfile.rb for more info. Anyways you can force this value in your production.rb
* document meta methodVijay Dev2011-08-041-3/+3
|
* Merge pull request #2327 from cesario/patch-1José Valim2011-07-281-1/+0
|\ | | | | We don't need to require erb here.
| * We don't need to require erb here.Franck Verrot2011-07-281-1/+0
| |
* | Merge pull request #2330 from thedarkone/resources-router-fixJosé Valim2011-07-281-8/+7
|\ \ | |/ |/| Inline resources router fix
| * Make use of the inherited initializer.thedarkone2011-07-281-3/+2
| |
| * There is no need to be destructive with the passed-in options.thedarkone2011-07-281-6/+6
| | | | | | | | This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.
* | simplify conditionals by assuming hash values will never be `false`Aaron Patterson2011-07-261-10/+2
| |
* | use regular ruby rather than clever rubyAaron Patterson2011-07-261-3/+3
| |
* | fixing wildcard path matching when wildcard is inside parenthesisAaron Patterson2011-07-261-1/+1
| |
* | Remove blank lineSantiago Pastorino2011-07-261-1/+0
| |
* | refactored 'assert_redirected_to': local call to validate_request! will be ↵thoefer2011-07-261-5/+4
| | | | | | | | called in assert_response already. changed names of local variables in order to recognize the semantics a bit easier.
* | Allow a route to have :format => trueErik Michaels-Ober2011-07-251-0/+2
| | | | | | | | | | | | When format is true, it is mandatory (as opposed to :format => false). This is currently not possible with resource routes, which automatically make format optional by default.
* | Merge pull request #2245 from ↵Santiago Pastorino2011-07-251-6/+5
|\ \ | | | | | | | | | | | | davidtrogers/constraints_block_passed_to_following_routes_in_same_scope Memoizing @blocks & disposing of constraints options properly
| * | Ensure the constraints block is only applied to the correct routeDave Rogers2011-07-251-6/+5
| |/ | | | | | | | | addresses issue #1907 - any routes that follow a route with a constraints block are inheriting the previous route's constraints.
* / Make polymorphic_url calls go through application helpers again.thedarkone2011-07-251-8/+1
|/ | | | This brings back the ability to overwrite/extend url generating methods in application heleprs.
* Check Accept and Content-Type headers before evaluating them in xhr ↵ogeidix2011-07-191-1/+2
| | | | | | requests. Closes #2119 An xhr request must have an "Accept" or "Content-type" header in order to be considered a request with valid_accept_header.
* Better formatting of route requirements in rake:routes.Hendy Tanata2011-07-161-7/+7
| | | | | | | | | | Previously it was: {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/} Now it becomes: photos#show {:id=>/[A-Z]\d{5}/}
* TODO fix explicitly loading exceptations, autoload removedVishnu Atrai2011-07-114-0/+4
|
* provide a more explicit message when using url_for with nilDamien Mathieu2011-07-021-1/+3
| | | This fixes the problem of having a non-explicit message when the :location option is not provided in respond_with.
* Add has_key? and key? methods to CookieJar removed in 0ca69ca65f83b4bb34f8José Valim2011-06-301-0/+5
|
* Revert "Delegate to @flashes with 'delegate' instead of manually."Aaron Patterson2011-06-291-2/+24
| | | | This reverts commit 701e8554a8f69b0c81fe794cba985bfda804161b.
* Delegate to @flashes with 'delegate' instead of manually.Ben Orenstein2011-06-291-24/+2
|
* Fix test to use Mime::ZipArun Agrawal2011-06-281-3/+3
|
* Register some commonly used mime types (png, jpeg, pdf, zip etc.) per defaultEsad Hajdarevic2011-06-281-0/+12
|
* Get the fixture_path from self.class instead of ActiveSupport::TestCase.David Chelimsky2011-06-251-1/+1
| | | | | | This allows test classes that are not subclasses of ActiveSupport::TestCase (like those in rspec-rails) to interact with with this variable without having to reference ActiveSupport::TestCase.
* Remove usage of memoizable from ActionPack.José Valim2011-06-161-3/+3
|
* Also change the default route commentWen-Tien Chang2011-06-161-1/+1
|
* Removed warning while running test with ruby 1.9.2bagwanpankaj2011-06-141-1/+1
|
* all requests are utf-8. Don't use the external encoding.Damien Mathieu2011-06-141-3/+2
|
* encode the uploaded file's name in the default external encoding - Closes #869Damien Mathieu2011-06-141-1/+12
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-111-3/+3
|\
| * shallow_path example updatedganesh2011-06-101-3/+3
| |
* | Merge pull request #1523 from raghunadhd/refactor_regexXavier Noria2011-06-101-4/+7
|\ \ | | | | | | rafactored the regex related code in the mapper class
| * | removed the unnecessary back slashes from the regular expressionRaghunadh2011-06-101-2/+2
| | |
| * | rafactored the regex related code in the mapper class Raghunadh2011-06-071-4/+7
| |/
* / remove warning: assigned but unused variableSantiago Pastorino2011-06-082-4/+1
|/
* Add backward compatibility for testing cookiesAndrew White2011-06-052-2/+8
| | | | | | | | | | | | | | | | | | | This commit restores the ability to assign cookies for testing via @request.env['HTTP_COOKIE'] and @request.cookies, e.g: @request.env['HTTP_COOKIE'] = 'user_name=david' get :index assert_equal 'david', cookies[:user_name] and @request.cookies[:user_name] = 'david' get :index assert_equal 'david', cookies[:user_name] Assigning via cookies[] is the preferred method and will take precedence over the other two methods. This is so that cookies set in controller actions have precedence and are carried over between calls to get, post, etc.
* Ensure cookie keys are stringsAndrew White2011-06-051-2/+3
|
* Add missing require for cookies middlewareAndrew White2011-06-041-0/+1
|