Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Action View is needed for DebugExceptions | Rafael Mendonça França | 2014-12-02 | 1 | -0/+2 |
| | | | | We should remove this dependency later. | ||||
* | Merge pull request #17873 from kirs/refactor-debug-erb | Rafael Mendonça França | 2014-12-02 | 4 | -23/+54 |
|\ | | | | | Refactor debug view | ||||
| * | Refactor debug view | Kir Shatrov | 2014-12-02 | 4 | -23/+54 |
| | | | | | | Avoid logic in ERB and use helpers | ||||
* | | Merge pull request #17862 from lucasmazza/lm-hide-action | Rafael Mendonça França | 2014-12-02 | 2 | -1/+4 |
|/ | | | | `_generate_paths_by_default` should always be private. | ||||
* | Merge pull request #17827 from rkh/rkh-fix-or-pattern | Aaron Patterson | 2014-12-01 | 2 | -0/+7 |
|\ | | | | | Fix OR in Journey patterns | ||||
| * | make OR in journey patterns compile to a valid regular expression | Konstantin Haase | 2014-11-29 | 2 | -0/+7 |
| | | |||||
* | | Pretty-print request params on exception page | Kir Shatrov | 2014-12-01 | 2 | -1/+9 |
| | | |||||
* | | Merge pull request #17823 from byroot/fix-mount-rack-apps-with-as | Sean Griffin | 2014-11-29 | 2 | -8/+2 |
|\ \ | | | | | | | Pure rack apps can be mounted with a name | ||||
| * | | Pure rack apps can be mounted with a name | Jean Boussier | 2014-11-29 | 2 | -8/+2 |
| | | | | | | | | | | | | See https://github.com/rails/rails/commit/9b15828b5c347395b42066a588c88e5eb4e72279#commitcomment-8764492 | ||||
* | | | Pass symbol as an argument instead of a block | Erik Michaels-Ober | 2014-11-29 | 14 | -25/+23 |
| | | | |||||
* | | | Bump required Ruby version to 2.1.0 | claudiob | 2014-11-28 | 1 | -1/+1 |
| |/ |/| | | | | | | | | | | | | | | | [This article](http://weblog.rubyonrails.org/2014/8/20/Rails-4-2-beta1/#maintenance-consequences-and-rails-5-0) states that: > Rails 5.0 is in most likelihood going to target Ruby 2.2. Before the exact minimum version is fully decided, @arthurnn [suggests](https://github.com/rails/rails/pull/17830#issuecomment-64940383) that **at least** version 2.1.0 **must** be required by the `gemspec` files. | ||||
* | | Start Rails 5 development :tada: | Rafael Mendonça França | 2014-11-28 | 2 | -413/+4 |
|/ | | | | | | | We will support only Ruby >= 2.1. But right now we don't accept pull requests with syntax changes to drop support to Ruby 1.9. | ||||
* | Bump to rack 1.6.0.beta2 | Santiago Pastorino | 2014-11-27 | 1 | -1/+1 |
| | |||||
* | Merge pull request #17803 from sadfuzzy/patch-2 | Abdelkader Boudih | 2014-11-27 | 1 | -1/+3 |
| | | | | | | Update cookies.rb Conflicts: actionpack/lib/action_dispatch/middleware/cookies.rb | ||||
* | Merge pull request #17186 from tgxworld/header_authentication_token | Matthew Draper | 2014-11-27 | 3 | -4/+37 |
|\ | | | | | | | Allow authentication header to not have to specify 'token=' key. | ||||
| * | Allow authentication header to not have to specify 'token=' key. | Guo Xiang Tan | 2014-10-10 | 2 | -4/+30 |
| | | | | | | | | Fixes: https://github.com/rails/rails/issues/17108. | ||||
* | | Refactor nested if | Bruno Sutic | 2014-11-26 | 1 | -5/+3 |
| | | |||||
* | | Remove extra empty line | Artur Cygan | 2014-11-26 | 1 | -1/+0 |
| | | |||||
* | | :scissors: | Rafael Mendonça França | 2014-11-26 | 1 | -1/+1 |
| | | |||||
* | | getting the location of the server | dilpreet92 | 2014-11-26 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #17728 from jcutrell/jcutrell/docs-to_session_value-for-pr | Rafael Mendonça França | 2014-11-25 | 1 | -3/+6 |
|\ \ | | | | | | | Adding simple docs for ActionDispatch::Flash::FlashHash#to_session_value | ||||
| * | | adding nodoc to private methods | Jonathan Cutrell | 2014-11-23 | 1 | -2/+2 |
| | | | |||||
| * | | Adding simple docs for ActionDispatch::Flash::FlashHash#to_session_value | Jonathan Cutrell | 2014-11-23 | 1 | -1/+4 |
| | | | |||||
* | | | Merge pull request #17733 from yuki24/do-not-rescue-exception-in-params-parser | Rafael Mendonça França | 2014-11-25 | 2 | -1/+11 |
|\ \ \ | | | | | | | | | Do not rescue Exception in ActionDispatch::ParamsParser | ||||
| * | | | Do not rescue Exception in ParamsParser | Yuki Nishijima | 2014-11-23 | 2 | -1/+11 |
| |/ / | | | | | | | | | | | | | Unlike ShowExceptions or PublicExceptions, ParamsParser shouldn't transform exceptions like Interrupt and NoMemoryError into ParserError. | ||||
* | | | Use released rails-dom-testing | Rafael Mendonça França | 2014-11-25 | 1 | -1/+1 |
| | | | |||||
* | | | CSS fix for the router visualizer | Bruno Sutic | 2014-11-25 | 1 | -4/+0 |
| | | | |||||
* | | | Merge pull request #17753 from gsamokovarov/dont-center-routing-table | Santiago Pastorino | 2014-11-25 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Don't center the routes table on routing errors | ||||
| * | | | Don't center the routes table on routing errors | Genadi Samokovarov | 2014-11-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'nil_script_name' | Santiago Pastorino | 2014-11-25 | 2 | -1/+8 |
|\ \ \ \ | |||||
| * | | | | Add regression test case to ensure script_name as nil is not used anymore in ↵ | Santiago Pastorino | 2014-11-25 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | url_for | ||||
| * | | | | sets script_name to always be a string. | JONBRWN | 2014-11-25 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #17615 #17616 when script_name is nil in the options hash, script_name is set to nil. options = {script_name: nil} script_name = options.delete(:script_name) {‘’} # => nil Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | | | Changelog format | Sean Griffin | 2014-11-24 | 1 | -2/+3 |
| | | | | |||||
* | | | | Merge branch 'deprecate-string-options-in-url-helpers' | Sean Griffin | 2014-11-24 | 3 | -1/+43 |
|\ \ \ \ | |||||
| * | | | | Deprecate string options in URL helpers | Melanie Gilman | 2014-11-24 | 3 | -1/+43 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/16958 [Byron Bischoff & Melanie Gilman] | ||||
* | | | | let mailer templates generate URLs by default [Xavier Noria, Richard Schneeman] | Xavier Noria | 2014-11-24 | 2 | -2/+12 |
| |/ / |/| | | |||||
* | | | Merge pull request #17747 from gsamokovarov/missing-template-backtrace | David Heinemeier Hansson | 2014-11-24 | 3 | -0/+33 |
|\ \ \ | | | | | | | | | Show source view and backtrace on missing template errors | ||||
| * | | | Show source view and backtrace on missing template errors | Genadi Samokovarov | 2014-11-24 | 3 | -0/+33 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | This will help you debug missing template errors, especially if they come from a programmatic template selection. Thanks to @dhh for suggesting that. As a bonus, also show request and response info on the routing error page for consistency. | ||||
* | | | Don't show the warning if we're already raising the error anyway | Godfrey Chan | 2014-11-23 | 1 | -8/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the route set is empty, or if none of the routes matches with a score > 0, there is no point showing the deprecation message because we are already be raising the `ActionController::UrlGenerationError` mentioned in the warning. In this case it is the expected behavior and the user wouldn't have to take any actions. | ||||
* | | | Deprecate `use_route` in controller tests | Godfrey Chan | 2014-11-23 | 2 | -3/+24 |
| | | | | | | | | | | | | Reference #17453 | ||||
* | | | Deprecate passing an invalid name to `Formatter#generate` | Godfrey Chan | 2014-11-23 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | The internal tests that (incorrectly) relied on this were already fixed in 938d130. However, we cannot simply fix this bug because the guides prior to b7b9e92 recommended a workaround that relies on this buggy behavior. Reference #17453 | ||||
* | | | Fix cases where the wrong name is passed to `Formatter#generate` | Godfrey Chan | 2014-11-23 | 2 | -2/+2 |
|/ / | | | | | | | | | These are currently working "by accident" because `match_route` does not check that the name is valid. | ||||
* | | Test using `ActionController::TestCase` with engines | Godfrey Chan | 2014-11-23 | 1 | -0/+52 |
| | | | | | | | | | | | | Reference #17453 [Godfrey Chan, Washington Luiz] | ||||
* | | Merge pull request #17715 from tgxworld/fix_nil_anchor | Godfrey Chan | 2014-11-22 | 3 | -1/+20 |
|\ \ | | | | | | | Anchor should not be appended when set to nil/false. | ||||
| * | | Anchor should not be appended when set to nil/false. | Guo Xiang Tan | 2014-11-23 | 3 | -1/+20 |
| | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/17714. | ||||
* | | | [ci skip] Fix comment of ActionDispatch::Callbacks | yui-knk | 2014-11-23 | 1 | -1/+1 |
| | | | | | | | | | | | | cc ddce3dd | ||||
* | | | Remove outdated comments [ci skip] | Godfrey Chan | 2014-11-22 | 1 | -6/+0 |
|/ / | | | | | They were introduced in 23b6def; the serial stuff has been removed since a5d80f8 | ||||
* | | Wrap code snippets in +, not backticks, in sdoc | claudiob | 2014-11-20 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | I grepped the source code for code snippets wrapped in backticks in the comments and replaced the backticks with plus signs so they are correctly displayed in the Rails documentation. [ci skip] | ||||
* | | Wrap code snippets in +, not backticks, in sdoc | claudiob | 2014-11-20 | 1 | -3/+3 |
| | | | | | | | | [ci skip] | ||||
* | | Use request method instead of ActionDispatch::Request#request_method instead ↵ | Ilya Katz | 2014-11-20 | 1 | -1/+1 |
| | | | | | | | | of ActionDispatch::Request#method to pick up overrides by the middleware |