Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add test for skip_before_filter with condition | Angelo capilleri | 2013-05-13 | 1 | -0/+13 |
| | |||||
* | Code cleanup for ActionDispatch::Flash#call | Julian Vargas | 2013-05-12 | 1 | -9/+3 |
| | | | | | | | The nested `if` was replaced by using `presence` which takes account for the given hash when it is `nil` or when it is empty. The `else` was removed because what it was doing was to assign to `env[KEY]` the value it already had. | ||||
* | Replace multi_json with json | Erik Michaels-Ober | 2013-05-11 | 1 | -1/+1 |
| | |||||
* | Merge pull request #10543 from vipulnsward/to_sort | Carlos Antonio da Silva | 2013-05-10 | 1 | -1/+1 |
|\ | | | | | Can you improve the commit message a little bit? It's good to describe why the change is happening. | ||||
| * | sort => sort! on new array | Vipul A M | 2013-05-10 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #10510 from think602/master | Xavier Noria | 2013-05-09 | 1 | -0/+1 |
|\ \ | |/ |/| | [ci skip] document protect_against_forgery? method | ||||
| * | [ci skip] document protect_against_forgery? method | Weston Platter | 2013-05-10 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #10536 from vipulnsward/fix_exp_warning | Carlos Antonio da Silva | 2013-05-09 | 1 | -1/+0 |
|\ \ | | | | | | | remove variable and fix warning | ||||
| * | | remove variable and fix warning | Vipul A M | 2013-05-09 | 1 | -1/+0 |
| | | | |||||
* | | | rails -> Rails [ci skip] | Prathamesh Sonpatki | 2013-05-09 | 1 | -1/+1 |
|/ / | |||||
* / | Fix that JSON and XML exception responses should give the HTTP error message ↵ | Jeremy Kemper | 2013-05-08 | 2 | -4/+4 |
|/ | | | | for their status, by default, not the message from the underlying exception | ||||
* | Test that #fresh_when accepts an array | Brandon Keepers | 2013-05-07 | 1 | -2/+19 |
| | | | | https://github.com/rails/etagger/pull/3 | ||||
* | Merge pull request #10377 from bricker/template_digest_ending_with_number | Rafael Mendonça França | 2013-05-06 | 4 | -3/+12 |
|\ | | | | | Allow numbers in partial name for digesting | ||||
| * | Allow numbers in partial name for digesting | Bryan Ricker | 2013-05-06 | 4 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | Add failing test for template with number at the end Use \w for RENDER_DEPENDENCY regex Spacing Add CHANGELOG entry | ||||
* | | Merge pull request #10446 from dasch/instrument-template-compilation | Rafael Mendonça França | 2013-05-06 | 1 | -2/+9 |
|\ \ | |/ |/| | Instrument template compilation | ||||
| * | Instrument template compilation | Daniel Schierbeck | 2013-05-06 | 1 | -2/+9 |
| | | |||||
* | | Merge pull request #10478 from cainlevy/patch-1 | Rafael Mendonça França | 2013-05-06 | 1 | -1/+1 |
|\ \ | | | | | | | use canonical #controller_path logic in controller test cases | ||||
| * | | use canonical #controller_path logic in controller test cases | Lance Ivy | 2013-05-05 | 1 | -1/+1 |
| | | | |||||
* | | | remove unused variable | Vipul A M | 2013-05-06 | 1 | -1/+0 |
| | | | |||||
* | | | Fix typo in documentation comment | Junya Ogura | 2013-05-06 | 1 | -1/+1 |
|/ / | |||||
* | | Added missing `require` to ActionView::LookupContext | Vladimir Strakhov | 2013-05-05 | 1 | -0/+1 |
| | | |||||
* | | Fix generating route from engine to other engine | Piotr Sarnacki | 2013-05-03 | 1 | -1/+2 |
|/ | | | | | | | | | | | | A regression was introduced in 5b3bb6, generating route from within an engine to an another engine resulted in prefixing a path with the SCRIPT_NAME value. The regression was caused by the fact that SCRIPT_NAME should be appended only if it's the SCRIPT_NAME for the application, not if it's SCRIPT_NAME from the current engine. closes #10409 | ||||
* | Merge pull request #10426 from tkrajcar/rescue-h1-fix | Carlos Antonio da Silva | 2013-05-02 | 1 | -0/+6 |
|\ | | | | | Add styling to h1 for default rescue layout | ||||
| * | Add styling to h1 | Tim Krajcar | 2013-05-02 | 1 | -0/+6 |
| | | |||||
* | | use constant for encoding | Nihad Abbasov | 2013-05-02 | 1 | -1/+1 |
|/ | |||||
* | Fix failing AP test | Carlos Antonio da Silva | 2013-05-01 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-01 | 1 | -1/+1 |
|\ | |||||
| * | fixed typo in select_tag docs | Rncrtr | 2013-04-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #9857 from yyyc514/bad_params_should_400 | Aaron Patterson | 2013-04-30 | 3 | -0/+8 |
|\ \ | | | | | | | failure to parse params should trigger a 400 Bad Request | ||||
| * | | failure to parse params should trigger a 400 Bad Request | Josh Goebel | 2013-03-21 | 3 | -0/+8 |
| | | | |||||
* | | | add missing semicolon to journey parser.y | Ben Holley | 2013-04-30 | 1 | -0/+1 |
| | | | |||||
* | | | Rack::Mount was replaced by Journey, Fixed comment | Gaurish Sharma | 2013-04-30 | 1 | -1/+1 |
| | | | |||||
* | | | rails/master is now 4.1.0.beta | Rafael Mendonça França | 2013-04-29 | 2 | -1193/+3 |
| | | | |||||
* | | | Bump version to rc1 | David Heinemeier Hansson | 2013-04-29 | 1 | -1/+1 |
| | | | |||||
* | | | Don't reprocess the options hash on every request | Andrew White | 2013-04-27 | 1 | -1/+2 |
| | | | |||||
* | | | Revert "Merge pull request #10337 from eimermusic/fix_template_digestor_lookup" | Rafael Mendonça França | 2013-04-25 | 3 | -11/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b4239622afc4f3f73808fd0c97512f3a534e07dd, reversing changes made to f99ce3c188f5dde57e2ff63e6a22363c62f0a4cd. Reason: This broke the build https://travis-ci.org/rails/rails/jobs/6629894 | ||||
* | | | Merge pull request #10337 from eimermusic/fix_template_digestor_lookup | Rafael Mendonça França | 2013-04-25 | 3 | -2/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix ActionView::Digestor to correctly pass format to LookupContext Conflicts: actionpack/CHANGELOG.md | ||||
| * | | | AV Digestor correctly passes format to LookupContext | Martin Westin | 2013-04-25 | 3 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionView::Digestor now passes arguments correctly to LookupContext::find method. This makes cache digests respect the format option correctly. FixtureFinder in tests also changed to reflect this. | ||||
* | | | | Add support for extra options to `force_ssl` | Andrew White | 2013-04-25 | 3 | -31/+159 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds support for passing additional url options along with a :status option and any of the flash-related options to `redirect_to` (i.e. :flash, :alert & :notice). Closes #7570. | ||||
* | | | | Use `request.fullpath` to build redirect url in `force_ssl` | Andrew White | 2013-04-25 | 3 | -4/+79 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `force_ssl` command now builds the redirect url from `request.fullpath`. This ensures that the format is maintained and it doesn't redirect to a route that has the same parameters but is defined earlier in `routes.rb`. Also any optional segments are maintained. Fixes #7528. Fixes #9061. Fixes #10305. | ||||
* | | | fixed missing comma in example | Ilya Vorontsov | 2013-04-24 | 1 | -1/+1 |
| | | | |||||
* | | | Add test for `format: false` with resources - closes #10323 | Andrew White | 2013-04-24 | 1 | -0/+29 |
| | | | |||||
* | | | applies documentation guidelines | Xavier Noria | 2013-04-22 | 1 | -11/+12 |
| | | | |||||
* | | | Merge pull request #10301 from vipulnsward/extract_in_mapper | Andrew White | 2013-04-22 | 1 | -2/+4 |
|\ \ \ | | | | | | | | | extract arrays to constants in Mapper | ||||
| * | | | extract arrays to constants in Mapper | Vipul A M | 2013-04-22 | 1 | -2/+4 |
| | | | | |||||
* | | | | Merge pull request #10299 from econsultancy/use-method-not-allowed-exception | Andrew White | 2013-04-22 | 4 | -0/+18 |
|\ \ \ \ | |/ / / |/| | | | Use MethodNotAllowed exception rather than UnknownHttpMethod | ||||
| * | | | Return a 405 response for unknown HTTP methods | Lewis Marshall | 2013-04-22 | 4 | -0/+18 |
| | | | | |||||
* | | | | extract no content response codes to a constant | Vipul A M | 2013-04-22 | 1 | -1/+2 |
|/ / / | |||||
* | | | Removing tests for deprecated options in active support. The | wangjohn | 2013-04-21 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | +use_full_path+ option was removed in 3b3790a4 and passing the template handler to render was deprecated in 43d27e91. | ||||
* | | | Increase readability of ternary statement in build method | buddhamagnet | 2013-04-20 | 1 | -2/+1 |
| | | |