Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | We shouldn't be linking to edgeapi [ci skip] | Godfrey Chan | 2014-11-25 | 1 | -1/+1 |
| | |||||
* | Prepare for RC: link to the 4-2-stable [ci skip] | Godfrey Chan | 2014-11-25 | 2 | -3/+3 |
| | |||||
* | Cross link to upgrade guide [ci skip] | Godfrey Chan | 2014-11-25 | 1 | -1/+2 |
| | |||||
* | 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> | ||||
* | Final sync with CHANGELOGs [ci skip] | Godfrey Chan | 2014-11-25 | 1 | -2/+7 |
| | |||||
* | :scissors: TODO | Godfrey Chan | 2014-11-25 | 1 | -4/+3 |
| | |||||
* | The default hasn't changed, so this is not an incompatibility [ci skip] | Godfrey Chan | 2014-11-25 | 1 | -16/+0 |
| | |||||
* | Simplify section on adequate record [ci skip] | Godfrey Chan | 2014-11-25 | 1 | -14/+14 |
| | |||||
* | Added tests for log_level deprecation | Godfrey Chan | 2014-11-25 | 1 | -13/+18 |
| | | | | | | Closes #17756 [Godfrey Chan, Zachary Scott] | ||||
* | Set the test_order in the basic app as well, see 58e8b48 | Godfrey Chan | 2014-11-25 | 2 | -0/+26 |
| | | | | This removes the unwanted deprecation warnings in the tests | ||||
* | Set the default log_level to info in all tests | Godfrey Chan | 2014-11-25 | 1 | -0/+1 |
| | | | | | | | | | This is a follow-up to 116de07. That change was for two reasons: 1) speed up the tests by reducing the amount of log lines 2) avoid a deprecation warning from a6de6f5. This setting need to be on the basic app too, otherwise the deprecation warning will show up on other unrelated test cases. | ||||
* | Merge pull request #17763 from kamipo/fix_out_of_range_error_message | Godfrey Chan | 2014-11-25 | 1 | -1/+1 |
|\ | | | | | Fix out of range error message | ||||
| * | Fix out of range error message | Ryuta Kamizono | 2014-11-25 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #17757 from zzak/railties-default-to-debug-log_level | Godfrey Chan | 2014-11-25 | 1 | -0/+1 |
|\ | | | | | Always default the log_level to :info for Railties | ||||
| * | Always default the log_level to :info for Railties | Zachary Scott | 2014-11-24 | 1 | -0/+1 |
| | | |||||
* | | Mention log_level deprecation in upgrade guides [ci skip] | Godfrey Chan | 2014-11-25 | 1 | -0/+12 |
| | | |||||
* | | Merge pull request #17755 from zzak/changelog-for-16622 | Godfrey Chan | 2014-11-25 | 2 | -0/+7 |
|\ \ | | | | | | | Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip] | ||||
| * | | Add Release Note for #16622 [ci skip] | Zachary Scott | 2014-11-24 | 1 | -0/+3 |
| | | | |||||
| * | | Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip] | Zachary Scott | 2014-11-24 | 1 | -0/+4 |
| |/ | |||||
* | | let the AM test suite pass in 1.9 | Xavier Noria | 2014-11-24 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #17760 from zzak/release-not-for-17743 | Sean Griffin | 2014-11-24 | 1 | -0/+13 |
|\ \ | | | | | | | Add release note for #17743 [ci skip] | ||||
| * | | Add release note for #17743 [ci skip] | Zachary Scott | 2014-11-24 | 1 | -0/+13 |
|/ / | |||||
* | | Merge pull request #17687 from fabiolnm/master | Rafael Mendonça França | 2014-11-25 | 2 | -20/+52 |
|\ \ | | | | | | | | | | Refs #17684: Enhances rdoc for ActiveJob assert_performed assertions | ||||
| * | | Add perform_enqueued_jobs | Fábio Luiz Nery de Miranda | 2014-11-25 | 2 | -20/+52 |
|/ / | | | | | | | | | | | | | | | | | It will set proper queue_adapter state required by assert_performed_jobs assertions. Also the block version of assert_performed_jobs will make sure this state is respected. Fixes #17684 | ||||
* | | 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] | ||||
* | | | Merge pull request #17758 from tgxworld/mailer_generator | Rafael Mendonça França | 2014-11-25 | 6 | -31/+68 |
|\ \ \ | | | | | | | | | Follow up to #17646. | ||||
| * | | | Update docs to reflect changes to MailerGenerator. | Guo Xiang Tan | 2014-11-25 | 2 | -22/+43 |
| | | | | |||||
| * | | | Add missing CHANGELOG entry. | Guo Xiang Tan | 2014-11-25 | 1 | -0/+7 |
| | | | | |||||
| * | | | Generate mailer layouts even if no action is given. | Guo Xiang Tan | 2014-11-25 | 2 | -4/+6 |
| | | | | |||||
| * | | | MailerGenerator should inherit from Base. | Guo Xiang Tan | 2014-11-25 | 1 | -3/+4 |
| | | | | |||||
| * | | | Add tests which were incorrectly removed. | Guo Xiang Tan | 2014-11-25 | 3 | -4/+10 |
|/ / / | |||||
* | | | Merge pull request #17646 from andyjeffries/html_layout_fix | David Heinemeier Hansson | 2014-11-25 | 8 | -12/+54 |
|\ \ \ | | | | | | | | | Creating mailer layouts by default, including html and body tags | ||||
| * | | | Removing unnecessary File.join calls | Andy Jeffries | 2014-11-24 | 2 | -2/+2 |
| | | | | |||||
| * | | | Creates an ApplicationMailer and layout by default, including html and body ↵ | Andy Jeffries | 2014-11-21 | 8 | -12/+54 |
| | | | | | | | | | | | | | | | | tags to reduce spam score | ||||
* | | | | let mailer templates generate URLs by default [Xavier Noria, Richard Schneeman] | Xavier Noria | 2014-11-24 | 7 | -12/+107 |
| | | | | |||||
* | | | | allow types to be passed in for USING casts | Aaron Patterson | 2014-11-24 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us so abstract the migration from the type that is actually used by Rails. For example, ":string" may be a varchar or something, but the framework does that translation, and the app shouldn't need to know. | ||||
* | | | | oops, forgot to add the real assertion! | Aaron Patterson | 2014-11-24 | 1 | -0/+1 |
| | | | | |||||
* | | | | allow the "USING" statement to be specified on change column calls | Aaron Patterson | 2014-11-24 | 2 | -1/+28 |
| | | | | |||||
* | | | | Merge pull request #17682 from ReneB/docs/update_all | Rafael Mendonça França | 2014-11-24 | 1 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | Explain that default_scope also influences update_all | ||||
| * | | | | Reword documentation for update_all | René van den Berg | 2014-11-24 | 1 | -8/+1 |
| | | | | | | | | | | | | | | | It now contains a carefully formulated reference to the "current relation" which might help clarify that the receiving will generate its own scope, escaping the need for explicitly referencing `default_scope` which is, after all, just another way of specifying a scope and nothing special. | ||||
| * | | | | Explain that default_scope also influences update_all | René van den Berg | 2014-11-20 | 1 | -5/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This was not explicitly stated before and I needed to try it out to be certain. A little explicit statement in the API docs might help here. | ||||
* | | | | | Merge pull request #17752 from arthurnn/fix_sprockets-rails-dependency | Rafael Mendonça França | 2014-11-24 | 2 | -3/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Use sprockets-rails 2.2.x on base app and allow greater version | ||||
| * | | | | | Fix sprockets-rails dependency dance | Arthur Neves | 2014-11-24 | 2 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove sprockets-rails from generated Gemfile as rails has a hard-dependency on it - Also allow sprockets-rails >= 2.0.0 | ||||
* | | | | | | Document `String#html_safe` [ci skip] | Sean Griffin | 2014-11-24 | 1 | -0/+5 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | It should be part of the documented public API, since we have an entire section of the guides dedicated to it. Documented in a way that addresses the concerns which kept it undocumented in the past. | ||||
* | | | | | 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. |