Andrew Nesbitt
d814284506
Updated copyright notices for 2013
2012-12-31 20:35:29 +00:00
Rafael Mendonça França
d4c94accf7
Remove unneeded tests
...
These tests are needed only if we are using MiniTest::Spec
2012-12-31 13:57:24 -03:00
Rafael Mendonça França
5da4d5142a
Add active_support/testing/autorun
...
minitest/autorun load minitest/spec polluting the global namespace with
the DSL that we don't want on Rails
2012-12-31 13:57:24 -03:00
Rafael Mendonça França
eb4930e3c7
Inherit from MiniTest::Unit::TestCase instead of MiniTest::Spec
2012-12-31 13:57:23 -03:00
Jeremy Kemper
f9da785d0b
Move background jobs to the 'jobs' branch until fully baked. Not shipping with Rails 4.0.
2012-12-21 16:29:47 -08:00
Carlos Antonio da Silva
42b555dcf3
Fix Action Mailer changelog indenation to match other changelogs
...
Also some minor improvements to other changelogs. [ci skip]
2012-12-19 23:09:04 -02:00
Vijay Dev
5cc178a291
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
actionpack/lib/action_view/helpers/form_helper.rb
railties/lib/rails/info_controller.rb
2012-12-15 21:20:28 +05:30
Carlos Antonio da Silva
df9f9b7f3e
Convert changelogs to 1.9 hash style and fix some formatting [ci skip]
2012-12-14 20:25:22 -02:00
Carlos Antonio da Silva
2125a6a27f
Remove not used variable warnings from AM and AC
2012-12-11 23:57:56 -02:00
Rafael Mendonça França
287a8d878c
Merge pull request #8450 from senny/8448_mailer_return_values
...
the return value of mailer methods should not be relevant
2012-12-10 06:40:33 -08:00
Yves Senn
ec3429a3d6
The return value from mailer methods is not relevant.
2012-12-10 09:10:47 +01:00
Jeremy Kemper
8110035623
Revert "Omit directories from gemspec.files for RubyGems 2 compat."
...
Obviated by rubygems/rubygems@486ed83cc8
This reverts commit bb8923dee093b615615cdfb83b34d1b0bb254f25.
2012-12-09 17:14:27 -07:00
Francesco Rodriguez
4d6a314a22
use default_options= instead of default to avoid confusion
2012-12-09 00:01:28 -05:00
Jeremy Kemper
bb8923dee0
Omit directories from gemspec.files for RubyGems 2 compat.
...
RG2 packager expects each spec.files path to be a file and bombs when it tries to tarball a dir.
May revert if rubygems/rubygems#413 is accepted.
2012-12-08 17:18:46 -07:00
Francesco Rodriguez
4ec7493e3c
use _action callbacks in actionmailer
2012-12-08 10:21:20 -05:00
Vijay Dev
40e16121c0
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
guides/source/migrations.md
2012-12-04 22:26:16 +05:30
Jeremy Kemper
c7e4ee7932
Bump mailer to quiet the stdout log messages
2012-12-03 20:48:37 -07:00
Alvaro Pereyra
4940d6d096
Cleans and removes useless 'Examples' tag [ci skip]
2012-12-01 15:19:45 -05:00
Santiago Pastorino
544b5ee48b
Tiny refactor
2012-11-29 09:53:25 -02:00
Nate Berkopec
9cf33b55f3
Explicit multipart messages respect :parts_order
...
As issue #7978 , the order in which ActionMailer
sends multipart messages could be unintentionally
overwritten if a block is passed to the mail
method. This changes the mail method such that
:parts_order is always respected, regardless of
whether a block is passed to mail.
2012-11-19 11:27:22 -05:00
Yves Senn
1f1ccbcee5
make ActionMailer::QueuedMessage autoloadable
2012-11-18 14:28:50 +01:00
Mikel Lindsaar
aff1872a87
Upgrade mail dependency to 2.5.2
2012-11-18 15:54:15 +11:00
Mikel Lindsaar
89a00f3746
Upgrade mail dependency to 2.5.0
2012-11-18 10:41:16 +11:00
Vijay Dev
7b70eeed43
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
actionpack/lib/action_dispatch/routing/redirection.rb
2012-11-17 01:50:49 +05:30
Vinny Diehl
a96a176930
Clean up gemspecs
...
Organized the gemspec files a bit.
* Made quotes more consistent (single quotes dominated, so I used
that).
* Moved license line down a line, separating it logically, and removed
the extra whitespace before its = operator.
* Minor whitespace fixes.
2012-11-08 19:09:43 -05:00
AvnerCohen
8659212df2
Actionmailer to 1.9 hash syntax
2012-11-08 09:48:11 +02:00
Jon Leighton
7e17b0baec
Revert "Support Mailer.deliver_foo(*args)
as a synonym for Mailer.foo(*args).deliver
."
...
This reverts commit 7e0cf563639bc7508da381b1b8321c7a89be1aa8.
Conflicts:
actionmailer/CHANGELOG.md
See discussion at
7e0cf56363 (commitcomment-2075489)
2012-10-30 18:43:57 +00:00
Yves Senn
b786f065d3
Do not render views when mail() isn't called. (NullMail refactoring)
2012-10-28 20:45:43 +01:00
Joshua Peek
7dba1599d9
Remove old asset_path from rails config
2012-10-15 09:51:20 -05:00
Vijay Dev
f638ef951b
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
activerecord/lib/active_record/persistence.rb
railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
2012-10-11 01:05:14 +05:30
Robin Dupret
f839e619d4
Use a 1.9 Hash syntax in README files (fixes thanks to @vijaydev)
2012-10-10 15:14:03 +02:00
Aditya Sanghi
74bd13479b
Add missing CHANGELOG related to addition of callbacks to mailers.
2012-10-10 15:28:37 +05:30
Aditya Sanghi
b12d04808a
Revert "Add changelog/release note entries for missing ActionMailer super feature related to inclusion of callbacks in mailers"
...
This reverts commit f16ec8c864ba12c2315713af76b11be5887cfa3a.
2012-10-10 15:13:56 +05:30
Aditya Sanghi
f16ec8c864
Add changelog/release note entries for missing ActionMailer super feature related to inclusion of callbacks in mailers
2012-10-10 14:52:02 +05:30
Mike Moore
2a68f68aea
Update test locations
...
Change the default test locations to avoid confusion around the common
testing terms "unit" and "functional".
Add new rake tasks for the new locations, while maintaining backwards
compatibility with the old rake tasks.
New testing locations are as follows:
app/models -> test/models (was test/units)
app/helpers -> test/helpers (was test/units/helpers)
app/controllers -> test/controllers (was test/functional)
app/mailers -> test/mailers (was test/functional)
2012-10-09 17:53:56 -06:00
Kirill Nikitin
96f290eac0
Update actionmailer with new hash syntax.
2012-10-07 21:54:14 +04:00
Rafael Mendonça França
cfc0ca0516
Merge pull request #7708 from bdurand/optimize_log_subscribers
...
Optimize log subscribers to check if the log level is sufficient
2012-10-01 20:28:31 -07:00
Brian Durand
37852726c9
Optimize log subscribers to check if the log level is sufficient before performing an operations.
2012-09-30 09:47:24 -07:00
Jon Leighton
7e0cf56363
Support Mailer.deliver_foo(*args)
as a synonym for Mailer.foo(*args).deliver
.
...
This makes it easy to write e.g. `Mailer.expects(:deliver_foo)` when
testing code that calls the mailer.
2012-09-28 12:13:07 +01:00
Andy Lindeman
299e05706e
Also includes ConstantLookup dependency for controller and mailer tests
2012-09-26 23:21:26 -04:00
Mike Moore
58434e05fe
Support mailer tests using spec DSL
...
Improve how mailer tests to resolve mailers from the test name.
Add tests for mailer tests using the minitest spec DSL.
2012-09-24 14:46:58 -06:00
Mike Moore
0ce383db58
Register mailer tests for minitest's spec DSL
2012-09-24 14:31:05 -06:00
Rafael Mendonça França
0e288ec98c
Revert "update ActionMailer::Base documentation [ci skip]"
...
This reverts commit f5654e78b248ecc90e8556366c927e1176c2428f.
Conflicts:
actionmailer/lib/action_mailer/base.rb
Reason: @frodsan asked me to revert since this change is breaking the
documentation in the edge API site
2012-09-21 16:22:46 -03:00
Vijay Dev
3b7947ea31
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
actionmailer/lib/action_mailer/base.rb
activesupport/lib/active_support/configurable.rb
activesupport/lib/active_support/core_ext/module/deprecation.rb
guides/source/action_controller_overview.md
guides/source/active_support_core_extensions.md
guides/source/ajax_on_rails.textile
guides/source/association_basics.textile
guides/source/upgrading_ruby_on_rails.md
While resolving conflicts, I have chosen to ignore changes done in
docrails at some places - these will be most likely 1.9 hash syntax
changes.
2012-09-21 22:49:20 +05:30
Vijay Dev
7c0e3b87ef
remove nodoc [ci skip]
2012-09-21 22:36:13 +05:30
Francesco Rodriguez
255cefbff4
fix Hash#slice code example [ci skip]
2012-09-18 22:13:49 -05:00
Xavier Noria
9f2d1a146c
spurious space I saw in passing
2012-09-18 11:13:04 +02:00
Francesco Rodriguez
e2c7545cdd
update ActionMailer documentation [ci skip]
2012-09-17 19:18:56 -05:00
Francesco Rodriguez
f5654e78b2
update ActionMailer::Base documentation [ci skip]
2012-09-17 12:26:52 -05:00
Jeremy Kemper
2a301505ec
Use synchronous queue by default. Separate queued message delivery jobs from the queued message wrappers so the queue itself needn't be marshaled (due to queue reference QueuedMessage).
2012-09-16 22:37:47 -07:00