Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 git://github.com/lifo/docrails | Xavier Noria | 2010-11-27 | 1 | -3/+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 | ||||
* / / | Rakefiles are executables, and rake loads rake, not rakefile code | raggi | 2010-11-25 | 1 | -1/+1 |
|/ / | |||||
* | | 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 |
| | | |||||
* | | Revert "Bump up mail dependency to take advantage of relaxed i18n version ↵ | Mikel Lindsaar | 2010-11-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | requirement" Locking to ~> 2.2.9.1 means locking to < 2.2.10, not intended behaviour. This reverts commit e7de5dd11e04f03e32865be8bb8c090a96a79ec9. | ||||
* | | Bump up mail dependency to take advantage of relaxed i18n version requirement | Mikel Lindsaar | 2010-11-16 | 1 | -1/+1 |
| | | |||||
* | | syncs CHANGELOGs for 3.0.2 in 3-0-stable with the ones in master | Xavier Noria | 2010-11-09 | 1 | -0/+4 |
| | | |||||
* | | Updating mail dependency to 2.2.9 | Mikel Lindsaar | 2010-10-26 | 1 | -1/+1 |
| | | |||||
* | | Merge CHANGELOGs from 3-0-stable | Santiago Pastorino | 2010-10-18 | 1 | -0/+3 |
| | | |||||
* | | 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 |
| | |||||
* | Remove old workaround for mocha bug. [#3886 state:committed] | James Mead | 2010-10-08 | 1 | -4/+1 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | 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 |
| | |||||
* | Bump up some deps | Santiago Pastorino | 2010-09-26 | 1 | -1/+1 |
| | |||||
* | Add namespacing to mailer generator | Piotr Sarnacki | 2010-09-25 | 1 | -0/+2 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge remote branch 'drogus/engines' | wycats | 2010-09-11 | 1 | -1/+1 |
|\ | |||||
| * | Do not require passing :app to mounted helpers, it's actually useless and ↵ | Piotr Sarnacki | 2010-09-08 | 1 | -1/+1 |
| | | | | | | | | not DRY | ||||
* | | Updating ActionMailer dependency to 2.2.6 | Mikel Lindsaar | 2010-09-11 | 1 | -1/+1 |
|/ | |||||
* | Fix action mailer tests after old mapper removal | Piotr Sarnacki | 2010-09-05 | 1 | -5/+3 |
| | |||||
* | 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 | ||||
* | Include routes helpers only for inherited classes in ActionMailer | Piotr Sarnacki | 2010-09-03 | 4 | -27/+66 |
| | |||||
* | Include application's helpers and router helpers by default, but include ↵ | Piotr Sarnacki | 2010-09-03 | 2 | -0/+14 |
| | | | | engine's ones for controllers inside isolated namespace | ||||
* | mounted helpers should be included in ActionMailer | Piotr Sarnacki | 2010-09-03 | 1 | -1/+2 |
| | |||||
* | Merge josevalim/deprecations branch. | José Valim | 2010-08-30 | 1 | -21/+2 |
|\ | | | | | | | I maintained on purpose the DeprecatedUrlOptions in ActionMailer and the Deprecated configuration in Railties because they were already addressed by Piotr in his RSoC work. | ||||
| * | Update CHANGELOGs for 3.0 release and upcoming 3.1 | Jeremy Kemper | 2010-08-29 | 1 | -21/+2 |
| | | |||||
* | | Deprecate the old mailer API that was not deprecated yet. | José Valim | 2010-08-29 | 13 | -116/+80 |
| | | |||||
* | | Remove the deprecated API from ActionMailer. | José Valim | 2010-08-29 | 5 | -262/+1 |
|/ | |||||
* | Clean up CHANGELOGs | Jeremy Kemper | 2010-08-28 | 1 | -1/+11 |
| | |||||
* | Ensure templates like template.html are found but still uses the proper ↵ | José Valim | 2010-08-26 | 3 | -0/+11 |
| | | | | virtual path. | ||||
* | Master is now targeting 3.1.0.beta | David Heinemeier Hansson | 2010-08-23 | 1 | -2/+2 |
| | |||||
* | Silence warnings for Encoding.default_external= and Encoding.default_internal= | Santiago Pastorino | 2010-08-22 | 1 | -3/+6 |
| | |||||
* | Set default_internal and default_external on AM for testing purposes | Santiago Pastorino | 2010-08-21 | 1 | -1/+8 |
| | |||||
* | deletes the rdoc task of each component, they are no longer published separately | Xavier Noria | 2010-08-20 | 1 | -16/+0 |
| | |||||
* | Bump up rdoc to 2.5.10 | Santiago Pastorino | 2010-08-18 | 1 | -1/+1 |
| |