Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-19 | 1 | -0/+7 |
|\ | | | | | | | | | | | Conflicts: railties/guides/source/ajax_on_rails.textile railties/guides/source/generators.textile | ||||
| * | brings a #:nodoc: back | Xavier Noria | 2011-04-19 | 1 | -1/+1 |
| | | |||||
| * | Undocumented :openssl_verify_mode option for smtp_settings | Florent Piteau | 2011-04-19 | 1 | -0/+4 |
| | | |||||
| * | docs for ActionMailer::Base.default_i18n_subject | Sebastian Martinez | 2011-04-18 | 1 | -1/+4 |
| | | |||||
* | | Fix missing requires in Action Mailer | Prem Sichanugrist | 2011-04-13 | 1 | -0/+1 |
|/ | | | | | | This made the isolated test failed on CI server. Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | AM register_interceptor and register_observer only constantize if the ↵ | Josh Kalderimis | 2011-04-06 | 1 | -2/+2 |
| | | | | argument is a String | ||||
* | remove AM delegating register_observer and register_interceptor to Mail and ↵ | Josh Kalderimis | 2011-04-04 | 2 | -5/+33 |
| | | | | | | instead implement smarter versions allowing for string class names, also added proper Railtie support with tests. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fix typo | Santiago Pastorino | 2011-03-09 | 1 | -1/+1 |
| | |||||
* | publicise ActionMailer::MailHelper.format_paragraph | Diego Carrion | 2011-03-09 | 1 | -1/+8 |
| | | | | | | [#6550 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Rename conflicting ActionMailer::MailHelper#simple_format method | Mat Brown | 2011-03-09 | 1 | -2/+2 |
| | | | | | This was conflicting with ActionView::Helpers::TextHelper#simple_format from within email templates. | ||||
* | style changes | JudeArasu | 2011-03-06 | 1 | -3/+5 |
| | |||||
* | Revert "style changes" | JudeArasu | 2011-03-06 | 1 | -3/+3 |
| | | | | This reverts commit 1d4826937e438ebcd6a2f9e29d2e466a43fef7a8. | ||||
* | style changes | JudeArasu | 2011-03-06 | 1 | -3/+3 |
| | |||||
* | styles applied for usage | JudeArasu | 2011-03-06 | 1 | -3/+4 |
| | |||||
* | Correct spelling for Base64 in action_mailer | Dalibor Nasevic | 2011-03-03 | 1 | -1/+1 |
| | |||||
* | We're in 2011, let's update our license | Prem Sichanugrist | 2011-02-22 | 1 | -1/+1 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | merges docrails | Xavier Noria | 2011-02-18 | 1 | -1/+1 |
|\ | |||||
| * | fix typo | Vijay Dev | 2011-02-17 | 1 | -1/+1 |
| | | |||||
* | | removing text-format in favor of a more simple solution | Aaron Patterson | 2011-02-09 | 1 | -10/+18 |
|/ | |||||
* | Removing unused method argument | Mikel Lindsaar | 2011-01-18 | 1 | -1/+1 |
| | |||||
* | Cleaning up style, concat inside method calls is ugly | Mikel Lindsaar | 2011-01-18 | 1 | -9/+12 |
| | |||||
* | Fixing redundant escape in regex | Mikel Lindsaar | 2011-01-18 | 1 | -1/+1 |
| | |||||
* | Should use standard ruby signature for respond_to | Mikel Lindsaar | 2011-01-18 | 1 | -1/+1 |
| | |||||
* | Fixing spelling | Mikel Lindsaar | 2011-01-18 | 1 | -2/+2 |
| | |||||
* | A bunch of cleanup on the inherited template patch | wycats | 2010-12-26 | 2 | -10/+3 |
| | |||||
* | Clean up asset_host and asset_path. | José Valim | 2010-12-09 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/peterb/docrails into peterb-master | Aditya Sanghi | 2010-11-29 | 1 | -1/+3 |
|\ | |||||
| * | Explain actionamailer authentication types | Peter Baker | 2010-10-14 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Ryan Bigg | 2010-11-26 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | * 'master' of github.com:lifo/docrails: Fix missing word in ActionMailer::Base documentation. | ||||
| * | | Fix missing word in ActionMailer::Base documentation. | Cheah Chu Yeow | 2010-11-25 | 1 | -2/+2 |
| | | | |||||
* | | | Update ActionMailer documentation to not use deprecated template_root method ↵ | Ryan Bigg | 2010-11-26 | 1 | -1/+1 |
|/ / | | | | | | | as documentation, but rather raise_delivery_errors method | ||||
* | | class inheritable attributes is used no more! all internal use of class ↵ | Josh Kalderimis | 2010-11-20 | 1 | -2/+5 |
| | | | | | | | | | | | | inheritable has been changed to class_attribute. class inheritable attributes has been deprecated. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Update the version.rb files to include a PRE part | Carl Lerche | 2010-11-16 | 1 | -2/+2 |
| | | |||||
* | | replace if ! with unless | Neeraj Singh | 2010-10-17 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Always pull in version for frameworks (standardize autoload / require / none) | wycats | 2010-10-10 | 1 | -0/+1 |
| | |||||
* | Provide a cleaner syntax for paths configuration that does not rely on ↵ | José Valim | 2010-10-06 | 1 | -3/+3 |
| | | | | method_missing. | ||||
* | mailer comment should use namespace in comment | Aditya Sanghi | 2010-10-06 | 1 | -1/+1 |
| | |||||
* | PERF: Don't create unnecessary objects | Santiago Pastorino | 2010-10-03 | 1 | -1/+1 |
| | |||||
* | PERF: change inject({}) with Hash + map | Santiago Pastorino | 2010-10-03 | 1 | -1/+1 |
| | |||||
* | self is implied, so remove self | Aaron Patterson | 2010-09-29 | 1 | -1/+1 |
| | |||||
* | dry up method missing | Aaron Patterson | 2010-09-29 | 1 | -5/+2 |
| | |||||
* | Call it compile_methods! and do the same on AM. | José Valim | 2010-09-27 | 1 | -0/+10 |
| | |||||
* | Add namespacing to mailer generator | Piotr Sarnacki | 2010-09-25 | 1 | -0/+2 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Do not require passing :app to mounted helpers, it's actually useless and ↵ | Piotr Sarnacki | 2010-09-08 | 1 | -1/+1 |
| | | | | not DRY | ||||
* | Set only helpers_path on inherited hook in action_controller/railtie.rb and ↵ | Piotr Sarnacki | 2010-09-03 | 2 | -29/+6 |
| | | | | use helper(:all) just after that | ||||
* | Moved ActionMailer and ActionController railties options to inherited hook | Piotr Sarnacki | 2010-09-03 | 2 | -6/+29 |
| | | | | | | | | | | | This change is needed, because we must take namespace into account and if controller's/mailer's class is namespaced, engine's paths should be set instead of application's ones. The nice side effect of this is removing unneeded logic in ActionController::Base.inherited - now the helpers_path should be set correctly even for engine's controllers, so helper(:all) will always include correct helpers. | ||||
* | We don't need to clear action_methods on inherited hook as they are cleaned ↵ | Piotr Sarnacki | 2010-09-03 | 1 | -5/+0 |
| | | | | on method_added hook | ||||
* | ActionMailer should not depend on ActionDispatch | Piotr Sarnacki | 2010-09-03 | 3 | -3/+2 |
| | |||||
* | Refactor ActionMailer to not use hide_actions | Piotr Sarnacki | 2010-09-03 | 3 | -54/+4 |
| | |||||
* | Move ActionController::Railties::RoutesHelpers and ↵ | Piotr Sarnacki | 2010-09-03 | 2 | -20/+2 |
| | | | | ActionMailer::Railties::RoutesHelper to AbstractController::Railties::RoutesHelpers |