rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-02-18	1	-2/+1
\|\
\| *	Fix AM block_format helper method description	Alexey Vakhov	2012-02-15	1	-2/+1
\| \|
* \|	Fix AM format_paragraph helper method if a first word is long	Alexey Vakhov	2012-02-15	1	-1/+1
\| \|
* \|	Cosmetic fixes in block_format AM helper method + test	Alexey Vakhov	2012-02-15	1	-2/+2
\|/
*	Merge pull request #4606 from lest/patch-1	Aaron Patterson	2012-01-24	1	-2/+0
\|\ \| \| \| \|	remove unnecessary AS::Concern usage
\| *	remove unnecessary AS::Concern usage	Sergey Nartimov	2012-01-22	1	-2/+0
\| \|
* \|	Use instance_eval instead of Proc#bind	Sergey Nartimov	2012-01-23	1	-2/+1
\|/ \| \| \|	Proc#bind is not useful when called immediately and previous check for #call method is not correct
*	Merge pull request #4605 from lest/patch-1	José Valim	2012-01-22	1	-3/+0
\|\ \| \| \| \|	remove obsolete code as old actionmailer api was removed
\| *	remove obsolete code as old actionmailer api was removed	Sergey Nartimov	2012-01-22	1	-3/+0
\| \|
* \|	some modifications in action_mailer/base.rb	Sachin87	2012-01-22	1	-2/+3
\|/
*	get rid of using instance_variable_names method from AS	Sergey Nartimov	2012-01-07	1	-1/+1
\| \| \| \| \|	- instance_variables return symbols in 1.9 - there is instance_variable_defined? method
*	test cases should inherit from AS::TestCase	Aaron Patterson	2012-01-05	1	-0/+1
\|
*	Array.wrap is no longer needed here	Rafael Mendonça França	2012-01-05	2	-11/+8
\|
*	Merge pull request #4248 from andrew/2012	Vijay Dev	2011-12-31	1	-1/+1
\|\ \| \| \| \|	Updated copyright notices for 2012
\| *	Updated copyright notices for 2012	Andrew Nesbitt	2011-12-31	1	-1/+1
\| \|
* \|	use Array#uniq in AM instead of deprecated Array#uniq_by	Sergey Nartimov	2011-12-24	2	-2/+1
\| \|
* \|	Correct grammar on Mailer generator -- passES. Working on enhancing ↵	Kristian Freeman	2011-12-22	1	-1/+1
\| \| \| \| \| \| \| \|	conventional readability in README and USAGE files.
* \|	fix default_i18n_subject comment in ActionMailer::Base	Indrek Juhkam	2011-12-20	1	-1/+1
\| \|
* \|	rails/master is now 4.0.0.beta and will only support Ruby 1.9.3+	David Heinemeier Hansson	2011-12-20	1	-3/+3
\| \|
* \|	Party like its R-C-UNO!	David Heinemeier Hansson	2011-12-19	1	-1/+1
\| \|
* \|	Default relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"]. Fixes #3365	Piotrek Okoński	2011-12-12	1	-2/+3
\| \|
* \|	Using InstanceMethods in a Concern is deprecated	Jeremy Kemper	2011-11-30	1	-10/+6
\| \|
* \|	Correct ActionMailer subject i18n lookup scope.	Andrew France	2011-10-20	1	-1/+1
\| \| \| \| \| \|	The :actionmailer i18n scope part is not used and according to https://github.com/rails/rails/pull/2542 the implementation is correct.
* \|	normalize arg for ActionMailer::TestCase tests method	Alexey Vakhov	2011-10-03	1	-1/+8
\| \|
* \|	update ActionMailer example using last truncate helper method signature	Alexey Vakhov	2011-09-26	1	-2/+2
\| \|
* \|	Master version is 3.2.0.beta	Santiago Pastorino	2011-06-30	1	-2/+2
\| \|
* \|	singularize module and be explicit about what is delivered	Matt Jankowski	2011-06-21	1	-1/+1
\| \|
* \|	grammar (missing "a") and formatting	Matt Jankowski	2011-06-21	1	-3/+3
\| \|
* \|	clarify why the only_path => false option is needed when default :host has ↵	Matt Jankowski	2011-06-21	1	-4/+4
\| \| \| \| \| \| \| \|	been set for mailers
* \|	elaborate details on why to use _url instead of _path in mailers	Matt Jankowski	2011-06-21	1	-2/+3
\| \|
* \|	typo changes	JudeArasu	2011-06-19	1	-2/+3
\| \|
* \|	copy-edits 7c2db6c, cbf2af1, and f391f94	Xavier Noria	2011-06-18	1	-1/+1
\| \|
* \|	The name for the plain text template in Rails3 appears to be ↵	Jason Fox	2011-06-15	1	-4/+4
\| \| \| \| \| \| \| \|	method.text.erb, not, method.text.plain.erb. Updated the doc to reflect this change. Also fixed a reference to an example that was incorrect.
* \|	typo changes	JudeArasu	2011-06-14	1	-1/+1
\| \|
* \|	fix typo	Vijay Dev	2011-06-08	1	-1/+1
\| \|
* \|	Add action_mailer observer and interceptors configuration options	Paco Guzman	2011-06-07	1	-4/+4
\| \|
* \|	minor typo in the rdoc about Interceptor.	Teng Siong Ong	2011-05-28	1	-1/+1
\| \|
* \|	minor spacing fix in code example in ActionMailer::Base.	Teng Siong Ong	2011-05-28	1	-8/+8
\|/
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-05-25	1	-6/+6
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
\| *	Remove extra white spaces on ActionMailer docs.	Sebastian Martinez	2011-05-23	1	-7/+7
\| \|
* \|	Removed deprecated ActionMailer API and related tests	Josh Kalderimis	2011-05-24	5	-343/+3
\| \|
* \|	Bump versions for rc1	David Heinemeier Hansson	2011-05-21	1	-1/+1
\| \|
* \|	Example Usage updated for actionpack and actionmailer.	Arun Agrawal	2011-05-19	1	-1/+1
\|/
*	Update Mailer generator to use 1.9 styled hash when run on Ruby 1.9	Prem Sichanugrist	2011-05-13	1	-2/+2
\| \| \| \|	As always, you can run `--old-style-hash` to override that.
*	More updates to ivars list.	José Valim	2011-05-06	2	-1/+3
\|
*	Move variables to underscore format, update protected instance variables list.	José Valim	2011-05-06	1	-3/+0
\|
*	Prepare for beta1	David Heinemeier Hansson	2011-05-04	1	-1/+1
\|
*	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
\| \|