Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Instantiate each part of our routing system: | Aaron Patterson | 2011-09-12 | 1 | -7/+8 |
| | | | | | | * A collection of Routes * The Router, which consults the collection of routes * A formatter that consults the collection of routes | ||||
* | stop freezing the routes | Aaron Patterson | 2011-09-12 | 1 | -1/+0 |
| | |||||
* | stop using a hash for parameterizing | Aaron Patterson | 2011-09-12 | 1 | -11/+9 |
| | |||||
* | Switching rack-mount to journey. | Aaron Patterson | 2011-09-12 | 1 | -1/+2 |
| | |||||
* | Merge pull request #2499 from akaspick/assert_select_email_fix | Jon Leighton | 2011-09-07 | 1 | -2/+2 |
|\ | | | | | Fix assert_select_email to work on non-multipart emails as well as converting the Mail::Body to a string to prevent errors. | ||||
| * | fix assert_select_email to work on non-multipart emails as well as ↵ | Andrew Kaspick | 2011-08-11 | 1 | -2/+2 |
| | | | | | | | | converting the Mail::Body to a string to prevent errors. | ||||
* | | Merge pull request #2577 from rails-noob/master | Santiago Pastorino | 2011-09-06 | 1 | -1/+3 |
|\ \ | | | | | | | Fix double slash at start of paths when mounting an engine at the root. | ||||
| * | | Fix bug #2579. | rails-noob | 2011-09-06 | 1 | -1/+3 |
| | | | | | | | | | | | | Avoids double slash at start of paths when mounting an engine at the root. | ||||
* | | | if ... nil? is more expensive than unless | Milan Dobrota | 2011-09-04 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-02 | 1 | -6/+6 |
|\ \ \ | |||||
| * | | | Fix name of parent resource params when declaring nested resources at routes | Carlos Paramio | 2011-09-01 | 1 | -6/+6 |
| | | | | |||||
* | | | | CookieJar is enumerable. fixes #2795 | Aaron Patterson | 2011-09-01 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge pull request #2718 from dasch/patch-5 | Vijay Dev | 2011-09-01 | 1 | -1/+4 |
|\ \ \ \ | |/ / / |/| | | | Split long string into multiple shorter ones | ||||
| * | | | Split long string into multiple shorter ones | Daniel Schierbeck | 2011-08-29 | 1 | -1/+4 |
| | | | | | | | | | | | | This makes the code more readable. | ||||
* | | | | Refactor ActionDispatch::Http::UploadedFile | Daniel Schierbeck | 2011-08-28 | 1 | -14/+3 |
|/ / / | |||||
* | | | doc fixes | Vijay Dev | 2011-08-28 | 1 | -4/+8 |
| | | | |||||
* | | | stop circular require warnings | Aaron Patterson | 2011-08-24 | 1 | -1/+0 |
|/ / | |||||
* | | We actually don't need a reverse_merge! here. dup removed was giving error ↵ | Arun Agrawal | 2011-08-12 | 1 | -1/+1 |
| | | | | | | | | with nil class. | ||||
* | | when calling url_for with a hash, additional (likely unwanted) values (such ↵ | Andrew Kaspick | 2011-08-11 | 1 | -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't | Santiago Pastorino | 2011-08-07 | 1 | -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 method | Vijay Dev | 2011-08-04 | 1 | -3/+3 |
| | |||||
* | Merge pull request #2327 from cesario/patch-1 | José Valim | 2011-07-28 | 1 | -1/+0 |
|\ | | | | | We don't need to require erb here. | ||||
| * | We don't need to require erb here. | Franck Verrot | 2011-07-28 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #2330 from thedarkone/resources-router-fix | José Valim | 2011-07-28 | 1 | -8/+7 |
|\ \ | |/ |/| | Inline resources router fix | ||||
| * | Make use of the inherited initializer. | thedarkone | 2011-07-28 | 1 | -3/+2 |
| | | |||||
| * | There is no need to be destructive with the passed-in options. | thedarkone | 2011-07-28 | 1 | -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 Patterson | 2011-07-26 | 1 | -10/+2 |
| | | |||||
* | | use regular ruby rather than clever ruby | Aaron Patterson | 2011-07-26 | 1 | -3/+3 |
| | | |||||
* | | fixing wildcard path matching when wildcard is inside parenthesis | Aaron Patterson | 2011-07-26 | 1 | -1/+1 |
| | | |||||
* | | Remove blank line | Santiago Pastorino | 2011-07-26 | 1 | -1/+0 |
| | | |||||
* | | refactored 'assert_redirected_to': local call to validate_request! will be ↵ | thoefer | 2011-07-26 | 1 | -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 => true | Erik Michaels-Ober | 2011-07-25 | 1 | -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 Pastorino | 2011-07-25 | 1 | -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 route | Dave Rogers | 2011-07-25 | 1 | -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. | thedarkone | 2011-07-25 | 1 | -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 ↵ | ogeidix | 2011-07-19 | 1 | -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 Tanata | 2011-07-16 | 1 | -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 removed | Vishnu Atrai | 2011-07-11 | 4 | -0/+4 |
| | |||||
* | provide a more explicit message when using url_for with nil | Damien Mathieu | 2011-07-02 | 1 | -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 0ca69ca65f83b4bb34f8 | José Valim | 2011-06-30 | 1 | -0/+5 |
| | |||||
* | Revert "Delegate to @flashes with 'delegate' instead of manually." | Aaron Patterson | 2011-06-29 | 1 | -2/+24 |
| | | | | This reverts commit 701e8554a8f69b0c81fe794cba985bfda804161b. | ||||
* | Delegate to @flashes with 'delegate' instead of manually. | Ben Orenstein | 2011-06-29 | 1 | -24/+2 |
| | |||||
* | Fix test to use Mime::Zip | Arun Agrawal | 2011-06-28 | 1 | -3/+3 |
| | |||||
* | Register some commonly used mime types (png, jpeg, pdf, zip etc.) per default | Esad Hajdarevic | 2011-06-28 | 1 | -0/+12 |
| | |||||
* | Get the fixture_path from self.class instead of ActiveSupport::TestCase. | David Chelimsky | 2011-06-25 | 1 | -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é Valim | 2011-06-16 | 1 | -3/+3 |
| | |||||
* | Also change the default route comment | Wen-Tien Chang | 2011-06-16 | 1 | -1/+1 |
| | |||||
* | Removed warning while running test with ruby 1.9.2 | bagwanpankaj | 2011-06-14 | 1 | -1/+1 |
| | |||||
* | all requests are utf-8. Don't use the external encoding. | Damien Mathieu | 2011-06-14 | 1 | -3/+2 |
| | |||||
* | encode the uploaded file's name in the default external encoding - Closes #869 | Damien Mathieu | 2011-06-14 | 1 | -1/+12 |
| |