Guo Xiang Tan
7a47690a13
Generate mailer layouts even if no action is given.
2014-11-25 09:21:37 +08:00
Guo Xiang Tan
35628a44b2
MailerGenerator should inherit from Base.
2014-11-25 09:16:11 +08:00
Guo Xiang Tan
b8d8ce7ba8
Add tests which were incorrectly removed.
2014-11-25 09:14:59 +08:00
David Heinemeier Hansson
35362fc226
Merge pull request #17646 from andyjeffries/html_layout_fix
...
Creating mailer layouts by default, including html and body tags
2014-11-25 01:59:43 +03:00
Xavier Noria
9685080a76
let mailer templates generate URLs by default [Xavier Noria, Richard Schneeman]
2014-11-24 14:33:50 -08:00
Aaron Patterson
cdd90f39d7
allow types to be passed in for USING casts
...
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.
2014-11-24 14:29:04 -08:00
Aaron Patterson
63963801c0
oops, forgot to add the real assertion!
2014-11-24 14:18:33 -08:00
Aaron Patterson
fbef981fdc
allow the "USING" statement to be specified on change column calls
2014-11-24 14:15:56 -08:00
Rafael Mendonça França
9f33e3daab
Merge pull request #17682 from ReneB/docs/update_all
...
Explain that default_scope also influences update_all
2014-11-24 19:46:00 -02:00
Rafael Mendonça França
4d157ea8c1
Merge pull request #17752 from arthurnn/fix_sprockets-rails-dependency
...
Use sprockets-rails 2.2.x on base app and allow greater version
2014-11-24 19:33:07 -02:00
Arthur Neves
8e1e9f6c70
Fix sprockets-rails dependency dance
...
- Remove sprockets-rails from generated Gemfile as rails has a hard-dependency on it
- Also allow sprockets-rails >= 2.0.0
2014-11-24 16:30:26 -05:00
Sean Griffin
0349516ddb
Document String#html_safe
[ci skip]
...
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.
2014-11-24 14:09:00 -07:00
David Heinemeier Hansson
47728d53aa
Merge pull request #17747 from gsamokovarov/missing-template-backtrace
...
Show source view and backtrace on missing template errors
2014-11-24 23:10:22 +03:00
Genadi Samokovarov
92ace39692
Show source view and backtrace on missing template errors
...
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.
2014-11-24 22:06:11 +02:00
Zachary Scott
2356714cc5
Merge pull request #17748 from claudiob/remove-unwanted-comments-from-documentation
...
Mark comments that should not be in the docs [ci skip]
2014-11-24 11:42:41 -08:00
claudiob
83821e2c4a
Mark comments that should not be in the docs
...
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]
2014-11-24 10:55:01 -08:00
Arthur Neves
96393c53f2
Add .reflections
change to release note [skip ci]
...
[related #17718 ]
2014-11-24 13:42:30 -05:00
Sean Griffin
72e8442797
Ensure the type map's cache is thread safe
...
Thanks to @thedarkone for pointing out that an instance of this object
is used in a shared context.
2014-11-24 11:24:31 -07:00
Godfrey Chan
81e0f010e8
Merge pull request #17725 from chancancode/deprecate_use_route
...
Deprecate use route
2014-11-24 10:08:48 -08:00
Santiago Pastorino
48a8830587
Merge pull request #17737 from yui-knk/fix/head
...
Replace ActionDispatch::Head with Rack::Head.
2014-11-24 14:58:01 -02:00
Santiago Pastorino
e3acd74fa8
Merge pull request #17678 from siddharth28/includes_with_scope_with_joins
...
Fix includes on association with a scope
2014-11-24 14:55:34 -02:00
Rafael Mendonça França
33c80cb69e
Merge pull request #17707 from claudiob/move-debug-helper-test
...
Move test that depends on ActiveRecord
2014-11-24 13:32:42 -02:00
Rafael Mendonça França
c16decacc2
Merge pull request #17744 from RichardLitt/doc-fix-syntax
...
Fix wrong path in comments about stylesheets
2014-11-24 13:27:54 -02:00
Richard Littauer
746c3741e7
Fix wrong path in comments about stylesheets
...
I put the wrong path in my last PR by accident. Fixed here. Related to #17742
2014-11-24 10:26:01 -05:00
Rafael Mendonça França
a891b7ee67
Merge pull request #17742 from RichardLitt/doc-fix-syntax
...
Change 'of plugins' syntax
2014-11-24 13:23:28 -02:00
Richard Littauer
7b378403d3
Change 'of plugins' syntax
...
Currently, the docs uses a syntax that is unclear and not general
American English. I've switched it to be clearer wording. Not a big
fix, but may be helpful.
2014-11-24 10:22:44 -05:00
René van den Berg
91c0c27769
Reword documentation for update_all
...
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.
2014-11-24 16:03:07 +01:00
Yves Senn
77fbc53586
cleanup, remove trailing whitespace [ci skip]
2014-11-24 12:14:47 +01:00
yui-knk
47ca6664fb
Replace ActionDispatch::Head with Rack::Head.
2014-11-24 19:48:51 +09:00
Andy Jeffries
a58da25d90
Removing unnecessary File.join calls
2014-11-24 09:37:49 +00:00
Zachary Scott
6a93aa6194
Grammar pass on Web Console release note [ci skip]
2014-11-23 23:17:26 -08:00
Zachary Scott
32be4ddda5
Clarify what is being serialized and when it will be deserialized
...
[ci skip]
2014-11-23 23:12:05 -08:00
Zachary Scott
be2f28d15f
Merge pull request #17721 from yui-knk/fix/rails_on_rack_guide
...
[ci skip] Fix class name of middleware.
2014-11-23 21:42:12 -08:00
Guillermo Iguaran
9fc198e6c3
Merge pull request #17732 from rails/add-reflections-string-keys-test
...
Add a test for reflection keys as Strings, fixes #16928
2014-11-23 20:32:12 -05:00
Zachary Scott
be8d1a9b57
Add a test for reflection keys as Strings, fixes #16928
...
See also PR: #17610
2014-11-23 12:06:57 -08:00
Arthur Nogueira Neves
c837259ae4
Merge pull request #17723 from marocu/patch-1
...
Specified beta branch for web-console gem
2014-11-23 14:27:01 -05:00
Godfrey Chan
23b21f6182
Don't show the warning if we're already raising the error anyway
...
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.
2014-11-23 01:46:51 -08:00
Godfrey Chan
8e73abbda8
Deprecate use_route
in controller tests
...
Reference #17453
2014-11-23 01:42:46 -08:00
Godfrey Chan
c23bb156fe
Deprecate passing an invalid name to Formatter#generate
...
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
2014-11-23 01:40:32 -08:00
Godfrey Chan
938d130c62
Fix cases where the wrong name is passed to Formatter#generate
...
These are currently working "by accident" because `match_route` does not check
that the name is valid.
2014-11-23 01:08:53 -08:00
Godfrey Chan
b7b9e92093
Correct example in the engines testing guide [ci skip]
...
Reference #17453
2014-11-23 00:15:47 -08:00
Godfrey Chan
77a276411e
Test using ActionController::TestCase
with engines
...
Reference #17453
[Godfrey Chan, Washington Luiz]
2014-11-23 00:07:30 -08:00
Godfrey Chan
ede97c6bb5
Merge pull request #17715 from tgxworld/fix_nil_anchor
...
Anchor should not be appended when set to nil/false.
2014-11-22 21:54:01 -08:00
Matthew Cullum
331482ab68
Specified beta branch for web-console gem
2014-11-22 20:48:10 -08:00
Zachary Scott
165d27440b
Merge pull request #17722 from yui-knk/fix/callbacks_comment
...
[ci skip] Fix comment of ActionDispatch::Callbacks
2014-11-22 20:25:39 -08:00
yui-knk
9cb831ff84
[ci skip] Fix comment of ActionDispatch::Callbacks
...
cc ddce3dd
2014-11-23 13:22:36 +09:00
yui-knk
1069641bbc
[ci skip] Fix class name of middleware.
2014-11-23 13:20:28 +09:00
Zachary Scott
ddce3dd37d
[ci skip] Dispatching is a verb 🙇
...
cc #17719
2014-11-22 19:11:51 -08:00
Zachary Scott
2cda792e3c
Merge pull request #17719 from yui-knk/fix/rails_on_rack_guide
...
Fix explanation for ActionDispatch::Callbacks. [ci skip]
2014-11-22 19:09:49 -08:00
yui-knk
13b0ac7b69
Fix explanation for ActionDispatch::Callbacks.
...
ActionDispatch::Callbacks dose not run the prepare callbacks,
so change with comment on ActionDispatch::Callbacks.
2014-11-23 11:04:17 +09:00