TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
39,577 Commits 2 Branches 0 Tags 294 MiB
a94e2db05c
Commit Graph

1077 Commits

Author SHA1 Message Date
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
Megan Bowra-Dean
94b97f6154 Fix documentation for ActionMailer template names. 
ActionMailer templates that are not plain text do not require *.text.* in the name and will fail to be picked up automatically if it is included in the name.
 2013-05-17 17:48:25 +12:00
kennyj
98849c71ac Fix AM testcase break with mail 2.5.4. It seems that AM's testcase was wrong. 2013-05-17 09:44:01 +09:00
Zachary Scott
dfb69f2b8a Document Rails::Generators::MailerGenerator 2013-05-15 00:48:31 -04:00
Zachary Scott
328e876a15 nodoc ActionMailer module from lib/action_mailer/*.rb 2013-05-15 00:38:51 -04:00
Zachary Scott
98d81def34 Document ActionMailer::MailHelper 2013-05-15 00:36:07 -04:00
Zachary Scott
41c3670fab Document ActionMailer::LogSubscriber and ActionMailer::DeliveryMethods::ClassMethods 2013-05-15 00:19:38 -04:00
Zachary Scott
e47c85c696 ActionMailer::Collector should be nodoc'd 2013-05-15 00:17:37 -04:00
Mikel Lindsaar
e100d1e489 Update mail to minimum version 2.5.4 2013-05-14 15:00:44 +10:00
Vipul A M
1ed6ff1006 Extract variable out of loop 2013-05-13 09:20:19 +05:30
Zachary Scott
d790b50db4 Document ActionMailer::Base#set_content_type 2013-05-12 22:27:40 -04:00
Zachary Scott
f65f4fa538 RDoc style for ActionMailer::Base#mail 2013-05-10 00:20:20 -04:00
Zachary Scott
0d7daf24df Document ActionMailer::Base::default, ::mailer_name, and #mailer_name 2013-05-10 00:07:20 -04:00
Hendy Tanata
b245287bc5 Fix grammar on AM.mailer_name documentation. 2013-05-06 17:02:53 -07:00
Prem Sichanugrist
58533dc9bd Add some documentation for AM.mailer_name 2013-05-03 13:33:10 -04:00
Vijay Dev
7ead1d8143 Merge branch 'master' of github.com:lifo/docrails 2013-05-01 16:24:13 +05:30
Rafael Mendonça França
feb44b9213 rails/master is now 4.1.0.beta 2013-04-29 13:15:24 -03:00
David Heinemeier Hansson
1ec64297f9 Bump version to rc1 2013-04-29 08:29:18 -07:00
Alexey Vakhov
e1df81c205 Remove superfluous self. in Action Mailer mail method documetation 
Notation with `self` was sugestted at 0b05acd, when self.defaults was
extlib_inheritable_accessor. But now all Action Mailer examples are
without this self. It's nicer.
 2013-04-23 10:31:35 +04:00