aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge pull request #17755 from zzak/changelog-for-16622Godfrey Chan2014-11-252-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip]
| * | | | | | | | | | | | Add Release Note for #16622 [ci skip]Zachary Scott2014-11-241-0/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip]Zachary Scott2014-11-241-0/+4
| |/ / / / / / / / / / /
* | | | | | | | | | | | let the AM test suite pass in 1.9Xavier Noria2014-11-241-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #17760 from zzak/release-not-for-17743Sean Griffin2014-11-241-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add release note for #17743 [ci skip]
| * | | | | | | | | | | | Add release note for #17743 [ci skip]Zachary Scott2014-11-241-0/+13
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #17687 from fabiolnm/masterRafael Mendonça França2014-11-252-20/+52
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refs #17684: Enhances rdoc for ActiveJob assert_performed assertions
| * | | | | | | | | | | | Add perform_enqueued_jobsFábio Luiz Nery de Miranda2014-11-252-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 formatSean Griffin2014-11-241-2/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'deprecate-string-options-in-url-helpers'Sean Griffin2014-11-243-1/+43
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Deprecate string options in URL helpersMelanie Gilman2014-11-243-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/16958 [Byron Bischoff & Melanie Gilman]
* | | | | | | | | | | | | Merge pull request #17758 from tgxworld/mailer_generatorRafael Mendonça França2014-11-256-31/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | Follow up to #17646.
| * | | | | | | | | | | | Update docs to reflect changes to MailerGenerator.Guo Xiang Tan2014-11-252-22/+43
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add missing CHANGELOG entry.Guo Xiang Tan2014-11-251-0/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | Generate mailer layouts even if no action is given.Guo Xiang Tan2014-11-252-4/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | MailerGenerator should inherit from Base.Guo Xiang Tan2014-11-251-3/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add tests which were incorrectly removed.Guo Xiang Tan2014-11-253-4/+10
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #17646 from andyjeffries/html_layout_fixDavid Heinemeier Hansson2014-11-258-12/+54
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Creating mailer layouts by default, including html and body tags
| * | | | | | | | | | | | Removing unnecessary File.join callsAndy Jeffries2014-11-242-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Creates an ApplicationMailer and layout by default, including html and body ↵Andy Jeffries2014-11-218-12/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tags to reduce spam score
* | | | | | | | | | | | | let mailer templates generate URLs by default [Xavier Noria, Richard Schneeman]Xavier Noria2014-11-247-12/+107
| | | | | | | | | | | | |
* | | | | | | | | | | | | allow types to be passed in for USING castsAaron Patterson2014-11-241-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 Patterson2014-11-241-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | allow the "USING" statement to be specified on change column callsAaron Patterson2014-11-242-1/+28
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #17682 from ReneB/docs/update_allRafael Mendonça França2014-11-241-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain that default_scope also influences update_all
| * | | | | | | | | | | | | Reword documentation for update_allRené van den Berg2014-11-241-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_allRené van den Berg2014-11-201-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-dependencyRafael Mendonça França2014-11-242-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use sprockets-rails 2.2.x on base app and allow greater version
| * | | | | | | | | | | | | | Fix sprockets-rails dependency danceArthur Neves2014-11-242-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 Griffin2014-11-241-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-backtraceDavid Heinemeier Hansson2014-11-243-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | Show source view and backtrace on missing template errors
| * | | | | | | | | | | | | Show source view and backtrace on missing template errorsGenadi Samokovarov2014-11-243-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.
* | | | | | | | | | | | | Merge pull request #17748 from ↵Zachary Scott2014-11-244-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | claudiob/remove-unwanted-comments-from-documentation Mark comments that should not be in the docs [ci skip]
| * | | | | | | | | | | | | Mark comments that should not be in the docsclaudiob2014-11-244-0/+14
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some comments that are meant to separate blocks of code in a file show up on http://api.rubyonrails.org as though they were part of the documentation. This commit hides those comments from the documentation. Stems from the discussion with @zzak at https://github.com/voloko/sdoc/issues/79#issuecomment-64158738 [ci skip]
* | | | | | | | | | | | | Add `.reflections` change to release note [skip ci]Arthur Neves2014-11-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [related #17718]
* | | | | | | | | | | | | Ensure the type map's cache is thread safeSean Griffin2014-11-241-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to @thedarkone for pointing out that an instance of this object is used in a shared context.
* | | | | | | | | | | | | Merge pull request #17725 from chancancode/deprecate_use_routeGodfrey Chan2014-11-245-5/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate use route
| * | | | | | | | | | | | | Don't show the warning if we're already raising the error anywayGodfrey Chan2014-11-231-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 testsGodfrey Chan2014-11-232-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference #17453
| * | | | | | | | | | | | | Deprecate passing an invalid name to `Formatter#generate`Godfrey Chan2014-11-231-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 Chan2014-11-232-2/+2
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are currently working "by accident" because `match_route` does not check that the name is valid.
* | | | | | | | | | | | | Merge pull request #17737 from yui-knk/fix/headSantiago Pastorino2014-11-242-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace ActionDispatch::Head with Rack::Head.
| * | | | | | | | | | | | | Replace ActionDispatch::Head with Rack::Head.yui-knk2014-11-242-5/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #17678 from siddharth28/includes_with_scope_with_joinsSantiago Pastorino2014-11-245-12/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix includes on association with a scope
| * | | | | | | | | | | | | | Fix includes on association with a scope containing joins along with conditionssiddharth@vinsol.com2014-11-215-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on the joined assoiciation
* | | | | | | | | | | | | | | Merge pull request #17707 from claudiob/move-debug-helper-testRafael Mendonça França2014-11-241-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move test that depends on ActiveRecord
| * | | | | | | | | | | | | | | Move test that depends on ActiveRecordclaudiob2014-11-211-0/+0
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves a test from `test/template` to `test/activerecord` since the test depends on ActiveRecord. This matches the documentation from [RUNNING_UNIT_TESTS](https://github.com/rails/rails/blob/f28d1ddd507174ac233b773cc4f35c3c05ad32e7/actionview/RUNNING_UNIT_TESTS.rdoc): > Test cases in the test/activerecord/ directory depend on having activerecord and sqlite3 installed. > If Active Record is not in actionview/../activerecord directory, or the sqlite3 rubygem is not installed, these tests are skipped. > Other tests are runnable from a fresh copy of actionview without any configuration. --- More details about this commit. All the tests starting with `require 'active_record_unit'` are already inside `test/activerecord`, except for the one test this commit moves. If you don't have `active_record` on your machine, the following command currently fails on master: ```bash ```
* | | | | | | | | | | | | | | Merge pull request #17744 from RichardLitt/doc-fix-syntaxRafael Mendonça França2014-11-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong path in comments about stylesheets
| * | | | | | | | | | | | | | | Fix wrong path in comments about stylesheetsRichard Littauer2014-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I put the wrong path in my last PR by accident. Fixed here. Related to #17742
* | | | | | | | | | | | | | | | Merge pull request #17742 from RichardLitt/doc-fix-syntaxRafael Mendonça França2014-11-244-4/+4
|\| | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | Change 'of plugins' syntax
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 10:19:39 +0000