Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4908 from kennyj/fix_3864 | José Valim | 2012-02-06 | 2 | -1/+34 |
| | | | | Fix url_for method's behavior. GH #3684. | ||||
* | Clean up a bit default_response handling and cache format negotiation. | José Valim | 2012-02-04 | 2 | -19/+17 |
| | |||||
* | Merge pull request #4870 from sikachu/3-2-stable-responder-fix | José Valim | 2012-02-04 | 4 | -8/+60 |
|\ | | | | | Fix override API response bug in respond_with | ||||
| * | Fix override API response bug in respond_with | Prem Sichanugrist | 2012-02-03 | 4 | -8/+60 |
| | | | | | | | | | | | | | | | | | | | | Default responder was only using the given respond block when user requested for HTML format, or JSON/XML format with valid resource. This fix the responder so that it will use the given block regardless of the validity of the resource. Note that in this case you'll have to check for object's validity by yourself in the controller. Fixes #4796 | ||||
* | | Merge pull request #4879 from kennyj/fix_4873 | José Valim | 2012-02-04 | 2 | -2/+9 |
|/ | | | | Fix GH #4873. Allow swapping same class middleware. | ||||
* | Merge pull request #4735 from arton/master | Aaron Patterson | 2012-01-31 | 1 | -1/+5 |
| | | | | Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows | ||||
* | Merge check box fixes from remote-tracking branch ↵ | José Valim | 2012-01-27 | 3 | -5/+18 |
|\ | | | | | | | 'cantonio/checkbox-hidden-backport' into 3-2-stable | ||||
| * | don't set the hidden checkbox value if it's nil | Damien Mathieu | 2012-01-27 | 2 | -1/+9 |
| | | |||||
| * | check_box helper with :disabled => true generates disabled hidden field. ↵ | Tadas Tamošauskas | 2012-01-27 | 3 | -5/+8 |
|/ | | | | fixes #1953 | ||||
* | updating RAILS_VERSION | Xavier Noria | 2012-01-26 | 1 | -1/+1 |
| | |||||
* | CHANGELOG revision for v3.2.1 | Xavier Noria | 2012-01-26 | 1 | -0/+9 |
| | |||||
* | Revert usage of safe constantize | José Valim | 2012-01-26 | 1 | -1/+3 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | bumping journey to 1.0.1 | Aaron Patterson | 2012-01-26 | 1 | -1/+1 |
| | |||||
* | remove extra 'the' | Rohit Arondekar | 2012-01-26 | 1 | -1/+1 |
| | |||||
* | example bracket error | Damian Le Nouaille | 2012-01-26 | 1 | -1/+1 |
| | |||||
* | Test for unicode path support | Paul McMahon | 2012-01-25 | 1 | -0/+20 |
| | | | | This is currently broken due to a bug in journey. | ||||
* | Merge pull request #4639 from joevandyk/datetime-infinity-select-fix | Aaron Patterson | 2012-01-24 | 2 | -1/+13 |
|\ | | | | | datetime_select fix for dates of -infinity and +infinity | ||||
| * | datetime_select should work with -/+ infinity dates | Joe Van Dyk | 2012-01-24 | 2 | -1/+13 |
| | | |||||
* | | Remove unused variables to avoid warnings | Rafael Mendonça França | 2012-01-24 | 1 | -3/+0 |
| | | |||||
* | | Fix date_select with discard_month and discard_year options | Rafael Mendonça França | 2012-01-24 | 2 | -2/+39 |
| | | | | | | | | Closes #4553 and #4633 | ||||
* | | Fix date_select nil and blank and order case | Indrek Juhkam | 2012-01-24 | 2 | -18/+2 |
| | | |||||
* | | Add failing test for date_select | Indrek Juhkam | 2012-01-24 | 1 | -0/+16 |
|/ | | | | | date_select does not work when day is discarded, include blank option is enabled and struct date itself is nil. | ||||
* | Added custom regexps to ASTs that have literal nodes on either side of | Aaron Patterson | 2012-01-23 | 2 | -1/+82 |
| | | | | symbol nodes. Fixes #4585 | ||||
* | Merge pull request #4604 from ihid/3-2-stable | José Valim | 2012-01-22 | 2 | -0/+17 |
|\ | | | | | 3-2-stable: Fixed regression - unable to use a range as choices for form.select. | ||||
| * | Allow form.select to accept ranges. | Jeremy Walker | 2012-01-22 | 2 | -0/+17 |
| | | |||||
* | | document `:raise` option support for several helpers [ci skip] | Jonathan Roes | 2012-01-21 | 1 | -0/+3 |
|/ | |||||
* | Preparing for 3.2.0 release | David Heinemeier Hansson | 2012-01-20 | 2 | -2/+2 |
| | |||||
* | Update CHANGELOG | José Valim | 2012-01-19 | 1 | -2/+0 |
| | |||||
* | Do not deprecate performed? | José Valim | 2012-01-19 | 3 | -6/+10 |
| | |||||
* | Fix small typo in mail_to docs in url_helper.rb | Simon Baird | 2012-01-19 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG and docs for config.assets.logger | Guillermo Iguaran | 2012-01-18 | 1 | -0/+2 |
| | |||||
* | Silent Sprockets logger when config.assets.logger is set to false | Guillermo Iguaran | 2012-01-18 | 1 | -1/+4 |
| | |||||
* | Update changelog | Carlos Antonio da Silva | 2012-01-17 | 1 | -1/+16 |
| | |||||
* | Remove duplicated constant definition | Carlos Antonio da Silva | 2012-01-17 | 1 | -3/+0 |
| | | | | | ActionController::ActionControllerError is already defined in action_controller/metal/exceptions. | ||||
* | Deprecate AC::UnknownError and AC::DoubleRenderError | Carlos Antonio da Silva | 2012-01-17 | 5 | -12/+12 |
| | | | | | Use the constants AbstractController::ActionNotFound and AbstractController::DoubleRenderError respectively instead. | ||||
* | Add default charset config to ActionDispatch | Carlos Antonio da Silva | 2012-01-17 | 1 | -1/+2 |
| | |||||
* | Deprecate default_charset= at controller level | Carlos Antonio da Silva | 2012-01-17 | 2 | -14/+24 |
| | |||||
* | Add some deprecations for logic being removed in 4.0 | Carlos Antonio da Silva | 2012-01-17 | 5 | -15/+25 |
| | |||||
* | Add option to configure Sprockets logger | Rafael Mendonça França | 2012-01-17 | 2 | -1/+3 |
| | |||||
* | Merge pull request #4462 from spohlenz/fix-routing-tests | Aaron Patterson | 2012-01-16 | 1 | -0/+4 |
| | | | | Stub ip method of alternative request class in router tests | ||||
* | Add begin/ensure block since we are returning. | José Valim | 2012-01-14 | 1 | -3/+5 |
| | |||||
* | Use a BodyProxy instead of including a Module that responds to close. | Santiago Pastorino | 2012-01-13 | 4 | -15/+47 |
| | | | | Closes #4441 if Active Record is disabled assets are delivered correctly | ||||
* | depend on journey 1.0.0 | Aaron Patterson | 2012-01-12 | 1 | -1/+1 |
| | |||||
* | Made an example a little more realistic | codesnik | 2012-01-11 | 1 | -1/+1 |
| | |||||
* | Add CHANGELOG entry | Santiago Pastorino | 2012-01-10 | 1 | -0/+2 |
| | |||||
* | Rails initialization with initialize_on_precompile = false should set assets_dir | Santiago Pastorino | 2012-01-10 | 1 | -1/+4 |
| | |||||
* | Fix http digest authentication with trailing '/' or '?' (fixes #4038 and #3228) | Piotr Sarnacki | 2012-01-10 | 2 | -7/+51 |
| | |||||
* | Add original_fullpath and original_url methods to Request | Piotr Sarnacki | 2012-01-10 | 2 | -0/+32 |
| | |||||
* | Don't fork a process when assets:precompile:nondigest is invoked in ↵ | kennyj | 2012-01-07 | 1 | -3/+3 |
| | | | | assets:precompile:all. Improve GH #3694. | ||||
* | Infer currency negative format from positive one. | Tsutomu Kuroda | 2012-01-05 | 2 | -0/+8 |
| | | | | | | | | When a locale file sets the format of the positive currency value as '%n %u', the default negative currency format should be '-%n %u'. Cherry-picked from master (6724c8c8) |