Commit Graph

1024 Commits

Author SHA1 Message Date
Xavier Noria
e79d2c8aa6 copy-edit pass in AM changelog [ci skip] 2013-04-09 22:41:03 +02:00
Rafael Mendonça França
6e170e1b71 Merge pull request #10004 from choudhuryanupam/master
Refactored to remove unnecessary setup
2013-03-30 09:46:09 -07:00
Vijay Dev
6d8c070821 Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
	activerecord/test/cases/adapter_test.rb
	guides/source/testing.md

[ci skip]
2013-03-30 15:46:14 +05:30
Anupam Choudhury
2ff2f839ca Refactored to remove unnecessary setup 2013-03-30 13:16:31 +05:30
Charlie Somerville
c07e1515f7 Add version method to top level modules 2013-03-21 19:56:07 +11:00
Vipul A M
6893c23f48 drop an unused hash; change slang to SPECIAL 2013-03-19 11:00:01 +05:30
Waynn Lue
f1563f4226 "overwritten" is one word 2013-03-18 15:47:41 -07:00
Xavier Noria
ddd2c75b26 Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"
This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57.
2013-03-18 21:19:47 +01:00
Xavier Noria
c24528fbc9 instruct RDoc to only parse Ruby files under lib [Fixes #9779] 2013-03-18 20:36:32 +01:00
Waynn Lue
dbafd36a2d update README since email-service isn't a word 2013-03-11 15:41:44 -07:00
Yves Senn
a58e660837 Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip]. 2013-03-09 20:57:17 +01:00
Rafael Mendonça França
0f75e2c51f Update CHANGELOGS 2013-02-26 13:45:57 -03:00
David Heinemeier Hansson
c0bc9ce38c Preparing for 4.0.0.beta1 release 2013-02-25 08:31:50 -06:00
Carlos Antonio da Silva
744307e525 Send paths argument as an array rather than converting it internally 2013-01-28 23:25:03 -02:00
Olek Janiszewski
57bfbc249e Allow passing interpolations to #default_i18n_subject, e.g.:
# config/locales/en.yml
    en:
      user_mailer:
        welcome:
          subject: 'Hello, %{username}'

    # app/mailers/user_mailer.rb
    class UserMailer < ActionMailer::Base
      def welcome(user)
        mail(subject: default_i18n_subject(username: user.name))
      end
    end
2013-01-24 15:29:24 +01:00
Trung Lê
21df476f4c Use Rails 4 find_by in README [ci skip] 2013-01-15 04:21:03 +00:00
Jon Leighton
15b7482dfc Merge pull request #8568 from inossidabile/fix-in_clause_length
Correct source for in_clause_length for eager loading (Fix for #8474)
2013-01-11 01:34:43 -08:00
Vijay Dev
f049016cd3 Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	guides/source/getting_started.md
2013-01-09 01:04:15 +05:30
Akira Matsuda
930646b604 Update mailer generator USAGE
* it does not generate fixtures
* it generates .text.erb templates
2013-01-06 15:41:00 +09:00
Robin Dupret
975493a172 Fix missing spaces before and after equal signs in method definitions 2013-01-03 22:14:09 +01:00
Akira Matsuda
db4af11304 deliver_ is an old API 2013-01-04 04:54:39 +09:00
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
Boris Staal
1a7567d2af Eager loading made to use relation's in_clause_length instead of host's one (fixes #8474) 2012-12-20 19:51:25 +07: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