TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
41,611 Commits 2 Branches 0 Tags 294 MiB
6a45a690a2
Commit Graph

1095 Commits

Author SHA1 Message Date
Chun-wei Kuo
fbbd4e1899 Improve font of some code in API documentation [ci skip] 
* Add "<tt>" or "+" to improve font of some code and filenames in API documentation
* Does not contain wording changes
 2013-12-26 18:54:46 +08:00
Yves Senn
69b5dc7e00 document how to access mail previews. [ci skip] 
/cc @pixeltrix
 2013-12-18 14:38:02 +01:00
David Heinemeier Hansson
c0a2d474c5 Get ready to release 4.1.0.beta1 2013-12-17 16:05:28 -08:00
Carlos Antonio da Silva
6802196a6b Disable available locales checks to avoid warnings running the tests 2013-12-17 09:05:41 -02:00
Andrew White
d6dec7fcb6 Add mailer previews feature based on mail_view gem 2013-12-17 03:58:35 +00:00
Łukasz Strzałkowski
e064658d64 Include AV::Layouts directly in AM::Base 
No need to do this in railtie as AM depends on AV either way
 2013-12-05 01:03:03 +01:00
Łukasz Strzałkowski
d8888b94b3 Retain ActionPack dependency on ActionView 2013-12-05 01:02:46 +01:00
Yves Senn
23aa94a7b2 mail() without arguments is a getter for the current mail. 
This behavior is documented in our guides (http://edgeguides.rubyonrails.org/action_mailer_basics.html#action-mailer-callbacks)
but was broken in the past. This commit short curcuits
the `mail` method if:

  1. mail() was previously called
  2. no headers are passed
  3. no block is passed

Closes #13090.

/cc @pixeltrix
 2013-12-02 16:56:31 +01:00
Xavier Noria
17c29a0df0 Merge remote-tracking branch 'docrails/master' 
Conflicts:
	activesupport/lib/active_support/core_ext/hash/deep_merge.rb
	activesupport/lib/active_support/core_ext/hash/keys.rb
 2013-11-24 20:00:24 +01:00
Carlos Antonio da Silva
18964368f3 Improve changelogs 
Also make Action Mailer changelog format more consistent with the
others [ci skip]
 2013-11-22 08:30:04 -02:00
Mr A
3134605391 Ruby's new Hash syntax applied in actionmailer 2013-11-14 13:41:37 +05:30
Harshad Sabne
a1f1e6d9e2 Update README.rdoc [ci skip] 
Highlighted code
 2013-11-08 13:28:14 +05:30
Aaron Patterson
267e5c84f9 calculate the ivars to remove in advance as a set and cache them in a 
constant.

`view_assigns` can use the precalculated sets and remove instance
variables without allocating any extra arrays
 2013-11-06 14:21:40 -08:00
Yves Senn
6205476a53 Merge pull request #12591 from vipulnsward/remove_mail_merge 
Remove extra variable creation and merge.
 2013-10-20 23:58:53 -07:00
Daniel Schierbeck
8f0c5e00ff Instrument the generation of Action Mailer messages 
The processing of outbound mail is instrumented with the key
`process.action_mailer`. The payload includes the mailer name as well as
the mailer method.
 2013-10-20 15:21:15 +02:00
Vipul A M
f72437bf3f Remove extra variable creation and merge. 2013-10-20 10:31:41 +05:30
Waynn Lue
ba46d524db take out reference to previous versions of Rails 2013-09-12 14:44:38 -07:00
claudiob
d17333d10c Remove unused raw email fixtures 
The tests that used the raw_email_* fixtures were removed in d500ad3
 2013-09-12 01:09:32 -07:00
Steve Klabnik
db2c4abca6 Merge pull request #12184 from waynn/patch-4 
"previous version of Rails" is gramatically incorrect
 2013-09-10 18:55:29 -07:00
Waynn Lue
e2c17ff3ec [ci skip] 'previous version of Rails' is gramatically incorrect 2013-09-10 16:15:41 -07:00
Akira Matsuda
0c93a48904 Don't mutate the Base settings by merge!ing the given value 2013-09-10 18:10:48 +02:00
Łukasz Strzałkowski
40fcb9e822 Revert "Port all remaining self.protected_instance_variables to class methods" 
This reverts commit 7de994fa215e9f4c2856d85034bc4dd7b65d0c01.
 2013-09-02 23:18:02 +02:00
Łukasz Strzałkowski
7de994fa21 Port all remaining self.protected_instance_variables to class methods 2013-08-29 12:13:45 +02:00
Łukasz Strzałkowski
0d43df7ebf Make AV dependency for ActionMailer 2013-08-26 10:54:38 +02:00
Łukasz Strzałkowski
e868441896 Remove hard require to ActionView from ActionMailer 2013-08-25 11:39:12 +02:00
Łukasz Strzałkowski
9e6a1439d1 Require log_subscriber 2013-08-25 11:39:12 +02:00
Łukasz Strzałkowski
e29c1b3103 Remove dependency on AV 2013-08-25 11:39:12 +02:00
Łukasz Strzałkowski
d1760253f5 Load AV::Layout to AM::Base in railties 2013-08-25 11:39:11 +02:00
Łukasz Strzałkowski
2a25c4ce6d Do not silance mail gem warnings. 
I doesn't have any at the moment
 2013-08-25 11:39:11 +02:00
Łukasz Strzałkowski
3419ac26e9 Include AbsC::Rendering interface in ActionMailer 2013-08-25 11:39:09 +02:00
Łukasz Strzałkowski
75d38e4364 Do not include AV::Rendering 
It's already included in Layouts, makes no sense to doubly include it
 2013-08-25 11:39:08 +02:00
Łukasz Strzałkowski
8e5a7243a1 Integrate ActionMailer with ActionView 2013-08-25 11:39:08 +02:00
Vijay Dev
9abe72c760 Merge branch 'master' of github.com:rails/docrails 
Conflicts:
	actionview/README.rdoc
	activerecord/lib/active_record/migration.rb
	guides/source/development_dependencies_install.md
	guides/source/getting_started.md
 2013-08-17 21:49:16 +05:30
Vijay Dev
ec8ef1e105 Revert "Merge branch 'master' of github.com:rails/docrails" 
This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing
changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9.

Seems to be a code merge done by mistake.
 2013-08-17 21:46:39 +05:30
Rafael Mendonça França
4c743fd682 Merge pull request #11722 from arunagw/removed-deprecation-silenced-from-test 
As we are doing debug mode on
 2013-08-02 12:13:38 -07:00
Arun Agrawal
7e893717aa As we are doing debug mode on 
we don't need to silenced it
 2013-08-02 14:34:15 -04:00
Rajarshi Das
938481010a map => map! for stopping extra array creation 2013-08-02 18:04:34 +05:30
Arun Agrawal
f52832de2a grab executable from rubygems 
As done here d7fc97d3f90c0e30865d32ce202658f03248cacc
 2013-07-26 11:07:25 +02:00
Akira Matsuda
64202abc3d Don't mutate the Base settings by merge!ing the given value 2013-07-26 04:04:51 +09:00
Alex Tsukernik
49185875a5 don't convert mailer default values to procs 
Invoke mailer defaults as procs only if they are procs, do not convert
with to_proc.  That an object is convertible to a proc does not mean it's
meant to be always used as a proc.  Fixes #11533
 2013-07-22 14:25:20 -04:00
Carlos Antonio da Silva
f02d4ddc99 Merge pull request #11046 from arunagw/verbose_mode_on 
Verbose mode on when running tests
 2013-06-25 15:15:43 -07:00
Arun Agrawal
d88b390dfd Adding verbose in isolated test. 2013-06-21 14:14:36 +02:00
Arun Agrawal
67f668845e Saying gemcutter => rubygems [ci skip] 2013-06-21 11:04:52 +02:00
Arun Agrawal
a84a08ecea No need to load 'rake/packagetask' as it's already 
in 'rubygems/package_task'
 2013-06-02 20:41:21 +02:00
Rafael Mendonça França
97a607b32b No need CHANGELOG entry for a test fix 
[ci skip]
 2013-05-20 15:17:11 -03:00
Rafael Mendonça França
364d6374f6 Merge pull request #10646 from kennyj/fix_am_20130517 
Fix ActionMailer testcase break with mail 2.5.4.
 2013-05-20 11:15:46 -07:00
Vijay Dev
d71b0935a9 Merge branch 'master' of github.com:lifo/docrails 2013-05-19 21:40:12 +05:30
Vijay Dev
c62b7c1f07 Revert "ActionMailer::Collector should be nodoc'd" 
This reverts commit e47c85c696de1c4137c222bedc846b2cdbb0893f.

Reason: Let's not nodoc without reason.

[ci skip]
 2013-05-19 21:06:38 +05:30
Vijay Dev
99819d3c8e Revert "nodoc ActionMailer module from lib/action_mailer/*.rb" 
This reverts commit 328e876a1569058e47eaf7ea3f4f045a83b585fa.

Reason: Let's not nodoc without reason.

[ci skip]
 2013-05-19 21:06:06 +05:30
Vijay Dev
84d3f7bd09 Revert "Document Rails::Generators::MailerGenerator" 
This reverts commit dfb69f2b8a85586ad70071baba416747cbb07364.

Reason: Let's not nodoc without reason.

[ci skip]
 2013-05-19 21:05:35 +05:30