Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
| | ||||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-11 | 1 | -3/+3 | |
|\ | ||||||
| * | shallow_path example updated | ganesh | 2011-06-10 | 1 | -3/+3 | |
| | | ||||||
* | | Merge pull request #1523 from raghunadhd/refactor_regex | Xavier Noria | 2011-06-10 | 1 | -4/+7 | |
|\ \ | | | | | | | rafactored the regex related code in the mapper class | |||||
| * | | removed the unnecessary back slashes from the regular expression | Raghunadh | 2011-06-10 | 1 | -2/+2 | |
| | | | ||||||
| * | | rafactored the regex related code in the mapper class | Raghunadh | 2011-06-07 | 1 | -4/+7 | |
| |/ | ||||||
* / | remove warning: assigned but unused variable | Santiago Pastorino | 2011-06-08 | 2 | -4/+1 | |
|/ | ||||||
* | Add backward compatibility for testing cookies | Andrew White | 2011-06-05 | 2 | -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 strings | Andrew White | 2011-06-05 | 1 | -2/+3 | |
| | ||||||
* | Add missing require for cookies middleware | Andrew White | 2011-06-04 | 1 | -0/+1 | |
| | ||||||
* | Refactor ActionController::TestCase cookies | Andrew White | 2011-06-04 | 3 | -26/+11 | |
| | | | | | | | | | | | | | | | | | | Assigning cookies for test cases should now use cookies[], e.g: cookies[:email] = 'user@example.com' get :index assert_equal 'user@example.com', cookies[:email] To clear the cookies, use clear, e.g: cookies.clear get :index assert_nil cookies[:email] We now no longer write out HTTP_COOKIE and the cookie jar is persistent between requests so if you need to manipulate the environment for your test you need to do it before the cookie jar is created. | |||||
* | fix creating an empty route on 1.8. Closes #1210 | Damien Mathieu | 2011-06-01 | 1 | -1/+3 | |
| | ||||||
* | Corrected some typos and American vs. Queen's English issues | Lee Reilly | 2011-05-29 | 1 | -4/+4 | |
| | ||||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 7 | -24/+24 | |
|\ | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | |||||
| * | Remove extra white spaces on ActionPack docs. | Sebastian Martinez | 2011-05-23 | 7 | -18/+18 | |
| | | ||||||
| * | Fixed documentation for scope with path. | Anuj Dutta | 2011-05-22 | 1 | -2/+2 | |
| | | ||||||
| * | fixes code highlight in shallow_path example | Diego Plentz | 2011-05-19 | 1 | -4/+4 | |
| | | ||||||
* | | removed deprecated methods, and related tests, from ActionPack | Josh Kalderimis | 2011-05-24 | 5 | -46/+3 | |
| | | ||||||
* | | Remove extra white-space on some exception messages. | Sebastian Martinez | 2011-05-23 | 1 | -1/+1 | |
| | | ||||||
* | | Replace references to ActiveSupport::SecureRandom with just SecureRandom, ↵ | Jon Leighton | 2011-05-23 | 2 | -2/+2 | |
| | | | | | | | | and require 'securerandom' from the stdlib when active support is required. | |||||
* | | Restructure TemplateAssertions-related code to eliminate circular requires. | wycats | 2011-05-22 | 2 | -14/+6 | |
| | | | | | | Also, no need to include dependencies in AS::Concerns inside included blocks. | |||||
* | | Make :status an attr_reader to avoid unnecessary warning when replacing status= | wycats | 2011-05-22 | 1 | -1/+2 | |
| | | ||||||
* | | Correct example and expand on description of :shallow option for resources | Andrew White | 2011-05-21 | 1 | -3/+7 | |
| | | ||||||
* | | fixing sym and string cookie name, two cookies to browser bug. | steve | 2011-05-19 | 1 | -3/+3 | |
|/ | ||||||
* | Dump and load rack-cache stuff. | José Valim | 2011-05-17 | 1 | -2/+6 | |
| | ||||||
* | Merge pull request #247 from goncalossilva/performance_test | Jeremy Kemper | 2011-05-17 | 1 | -13/+6 | |
|\ | | | | | Performance tests improved | |||||
| * | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-05-08 | 14 | -101/+145 | |
| |\ | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/testing/performance.rb | |||||
| * \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-17 | 9 | -257/+134 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-03 | 1 | -3/+3 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-30 | 1 | -1/+7 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-28 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | remove deprecated documentation | Gonçalo Silva | 2011-03-28 | 1 | -3/+0 | |
| | | | | | | | ||||||
| * | | | | | | move "check for ruby-prof" from AD/testing/performance_test to ↵ | Gonçalo Silva | 2011-03-24 | 1 | -13/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | AS/testing/performance, where it is actually required |