Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | copy-edit pass in AM changelog [ci skip] | Xavier Noria | 2013-04-09 | 1 | -9/+11 |
| | |||||
* | Merge pull request #10004 from choudhuryanupam/master | Rafael Mendonça França | 2013-03-30 | 2 | -10/+0 |
|\ | | | | | Refactored to remove unnecessary setup | ||||
| * | Refactored to remove unnecessary setup | Anupam Choudhury | 2013-03-30 | 2 | -10/+0 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 1 | -2/+2 |
|\ \ | |/ |/| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip] | ||||
| * | "overwritten" is one word | Waynn Lue | 2013-03-18 | 1 | -1/+1 |
| | | |||||
| * | update README since email-service isn't a word | Waynn Lue | 2013-03-11 | 1 | -1/+1 |
| | | |||||
* | | Add version method to top level modules | Charlie Somerville | 2013-03-21 | 1 | -6/+7 |
| | | |||||
* | | drop an unused hash; change slang to SPECIAL | Vipul A M | 2013-03-19 | 1 | -1/+1 |
| | | |||||
* | | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]" | Xavier Noria | 2013-03-18 | 1 | -1/+1 |
| | | | | | | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57. | ||||
* | | instruct RDoc to only parse Ruby files under lib [Fixes #9779] | Xavier Noria | 2013-03-18 | 1 | -1/+1 |
| | | |||||
* | | Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip]. | Yves Senn | 2013-03-09 | 1 | -2/+2 |
|/ | |||||
* | Update CHANGELOGS | Rafael Mendonça França | 2013-02-26 | 1 | -0/+3 |
| | |||||
* | Preparing for 4.0.0.beta1 release | David Heinemeier Hansson | 2013-02-25 | 2 | -2/+2 |
| | |||||
* | Send paths argument as an array rather than converting it internally | Carlos Antonio da Silva | 2013-01-28 | 1 | -3/+3 |
| | |||||
* | Allow passing interpolations to `#default_i18n_subject`, e.g.: | Olek Janiszewski | 2013-01-24 | 4 | -3/+31 |
| | | | | | | | | | | | | | | | # 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 | ||||
* | Use Rails 4 find_by in README [ci skip] | Trung Lê | 2013-01-15 | 1 | -1/+1 |
| | |||||
* | Merge pull request #8568 from inossidabile/fix-in_clause_length | Jon Leighton | 2013-01-11 | 1 | -0/+5 |
|\ | | | | | Correct source for in_clause_length for eager loading (Fix for #8474) | ||||
| * | Eager loading made to use relation's in_clause_length instead of host's one ↵ | Boris Staal | 2012-12-20 | 1 | -0/+5 |
| | | | | | | | | (fixes #8474) | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-01-09 | 1 | -6/+6 |
|\ \ | | | | | | | | | | | | | Conflicts: guides/source/getting_started.md | ||||
| * | | deliver_ is an old API | Akira Matsuda | 2013-01-04 | 1 | -6/+6 |
| | | | |||||
* | | | Update mailer generator USAGE | Akira Matsuda | 2013-01-06 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | * it does not generate fixtures * it generates .text.erb templates | ||||
* | | | Fix missing spaces before and after equal signs in method definitions | Robin Dupret | 2013-01-03 | 2 | -3/+3 |
|/ / | |||||
* | | Updated copyright notices for 2013 | Andrew Nesbitt | 2012-12-31 | 2 | -2/+2 |
| | | |||||
* | | Remove unneeded tests | Rafael Mendonça França | 2012-12-31 | 2 | -181/+0 |
| | | | | | | | | These tests are needed only if we are using MiniTest::Spec | ||||
* | | Add active_support/testing/autorun | Rafael Mendonça França | 2012-12-31 | 1 | -1/+1 |
| | | | | | | | | | | minitest/autorun load minitest/spec polluting the global namespace with the DSL that we don't want on Rails | ||||
* | | Inherit from MiniTest::Unit::TestCase instead of MiniTest::Spec | Rafael Mendonça França | 2012-12-31 | 1 | -7/+0 |
| | | |||||
* | | Move background jobs to the 'jobs' branch until fully baked. Not shipping ↵ | Jeremy Kemper | 2012-12-21 | 8 | -68/+2 |
|/ | | | | with Rails 4.0. | ||||
* | Fix Action Mailer changelog indenation to match other changelogs | Carlos Antonio da Silva | 2012-12-19 | 1 | -23/+23 |
| | | | | Also some minor improvements to other changelogs. [ci skip] | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-15 | 1 | -1/+1 |
|\ | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb railties/lib/rails/info_controller.rb | ||||
| * | use default_options= instead of default to avoid confusion | Francesco Rodriguez | 2012-12-09 | 1 | -1/+1 |
| | | |||||
* | | Convert changelogs to 1.9 hash style and fix some formatting [ci skip] | Carlos Antonio da Silva | 2012-12-14 | 1 | -2/+2 |
| | | |||||
* | | Remove not used variable warnings from AM and AC | Carlos Antonio da Silva | 2012-12-11 | 1 | -2/+1 |
| | | |||||
* | | Merge pull request #8450 from senny/8448_mailer_return_values | Rafael Mendonça França | 2012-12-10 | 4 | -2/+16 |
|\ \ | | | | | | | the return value of mailer methods should not be relevant | ||||
| * | | The return value from mailer methods is not relevant. | Yves Senn | 2012-12-10 | 4 | -2/+16 |
| | | | |||||
* | | | Revert "Omit directories from gemspec.files for RubyGems 2 compat." | Jeremy Kemper | 2012-12-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Obviated by rubygems/rubygems@486ed83cc8e706069213c5d406122f4cfcca9e7f This reverts commit bb8923dee093b615615cdfb83b34d1b0bb254f25. | ||||
* | | | Omit directories from gemspec.files for RubyGems 2 compat. | Jeremy Kemper | 2012-12-08 | 1 | -1/+1 |
| |/ |/| | | | | | | | | | 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. | ||||
* | | use _action callbacks in actionmailer | Francesco Rodriguez | 2012-12-08 | 4 | -14/+14 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-04 | 1 | -2/+0 |
|\ \ | |/ |/| | | | | | Conflicts: guides/source/migrations.md | ||||
| * | Cleans and removes useless 'Examples' tag [ci skip] | Alvaro Pereyra | 2012-12-01 | 1 | -2/+0 |
| | | |||||
* | | Bump mailer to quiet the stdout log messages | Jeremy Kemper | 2012-12-03 | 1 | -1/+1 |
|/ | |||||
* | Tiny refactor | Santiago Pastorino | 2012-11-29 | 1 | -4/+1 |
| | |||||
* | Explicit multipart messages respect :parts_order | Nate Berkopec | 2012-11-19 | 3 | -29/+30 |
| | | | | | | | | | 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. | ||||
* | make ActionMailer::QueuedMessage autoloadable | Yves Senn | 2012-11-18 | 1 | -0/+1 |
| | |||||
* | Upgrade mail dependency to 2.5.2 | Mikel Lindsaar | 2012-11-18 | 1 | -1/+1 |
| | |||||
* | Upgrade mail dependency to 2.5.0 | Mikel Lindsaar | 2012-11-18 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-17 | 1 | -9/+9 |
|\ | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb | ||||
| * | Actionmailer to 1.9 hash syntax | AvnerCohen | 2012-11-08 | 1 | -9/+9 |
| | | |||||
* | | Clean up gemspecs | Vinny Diehl | 2012-11-08 | 1 | -7/+10 |
|/ | | | | | | | | | | 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. | ||||
* | Revert "Support `Mailer.deliver_foo(*args)` as a synonym for ↵ | Jon Leighton | 2012-10-30 | 3 | -15/+0 |
| | | | | | | | | | | | | `Mailer.foo(*args).deliver`." This reverts commit 7e0cf563639bc7508da381b1b8321c7a89be1aa8. Conflicts: actionmailer/CHANGELOG.md See discussion at https://github.com/rails/rails/commit/7e0cf563639bc7508da381b1b8321c7a89be1aa8#commitcomment-2075489 | ||||
* | Do not render views when mail() isn't called. (NullMail refactoring) | Yves Senn | 2012-10-28 | 5 | -1/+28 |
| |