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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '3-2-sec' into 3-2-stable	Aaron Patterson	2013-02-11	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 3-2-sec: bumping version remove ruby-prof Fix issue with attr_protected where malformed input could circumvent protection fixing call to columns hash. run the damn tests when you backport! Bump rack dependency to 1.4.5 Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric Conflicts: Gemfile activerecord/CHANGELOG.md
\| *	bumping version	Aaron Patterson	2013-02-10	1	-1/+1
\| \|
* \|	Merge branch '3-2-sec' into 3-2-secmerge	Aaron Patterson	2013-01-08	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 3-2-sec: bumping version CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu Avoid Rack security warning no secret provided Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md
\| *	bumping version	Aaron Patterson	2013-01-08	1	-1/+1
\| \|
* \|	Merge tag 'v3.2.10' into 3-2-stable	Miguel	2013-01-03	1	-1/+1
\|\\| \| \| \| \| \| \|	Latest released tag was not fully merged into the stable branch (missed version bumping)
\| *	bumping version to 3.2.10	Aaron Patterson	2012-12-23	1	-1/+1
\| \|
* \|	Backport #8450, the return value from mailer methods is not relevant.	Yves Senn	2012-12-10	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: actionmailer/CHANGELOG.md actionmailer/lib/action_mailer/base.rb
* \|	revised the actionmailer's CHANGELOG structure	Yves Senn	2012-12-10	1	-7/+8
\|/
*	Bump to 3.2.9	Santiago Pastorino	2012-11-12	1	-1/+1
\|
*	Bump up to 3.2.9.rc3	Santiago Pastorino	2012-11-09	1	-1/+1
\|
*	Bump to 3.2.9.rc2	Santiago Pastorino	2012-11-01	1	-1/+1
\|
*	Bump to 3.2.9.rc1	Santiago Pastorino	2012-10-29	1	-2/+2
\|
*	Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call	Rafael Mendonça França	2012-10-28	1	-1/+13
\| \| \| \| \| \|	Do not render views when mail() isn't called. (NullMail refactoring) Conflicts: actionmailer/CHANGELOG.md
*	Bump to 3.2.8	Santiago Pastorino	2012-08-09	1	-1/+1
\|
*	Bump to 3.2.8.rc2	Santiago Pastorino	2012-08-03	1	-1/+1
\|
*	Bump to 3.2.8.rc1	Santiago Pastorino	2012-08-01	1	-2/+2
\|
*	bumping to 3.2.7	Aaron Patterson	2012-07-26	1	-1/+1
\|
*	updating the version	Aaron Patterson	2012-07-23	1	-2/+2
\|
*	bumping version numbers	Aaron Patterson	2012-06-11	1	-1/+1
\|
*	bumping to 3.2.5	Aaron Patterson	2012-05-31	1	-1/+1
\|
*	bumping to 3.2.4	Aaron Patterson	2012-05-31	1	-1/+1
\|
*	bumping to 3.2.4.rc1	Aaron Patterson	2012-05-28	1	-2/+2
\|
*	Merge pull request #6018 from lest/patch-1	Carlos Antonio da Silva	2012-05-14	1	-1/+2
\| \| \| \|	mailer can be anonymous
*	Bump up to 3.2.3	Santiago Pastorino	2012-03-30	1	-1/+1
\|
*	Bumping to 3.2.3.rc2	Santiago Pastorino	2012-03-29	1	-1/+1
\|
*	Bumping to 3.2.3.rc1	Santiago Pastorino	2012-03-27	1	-2/+2
\|
*	bumping to 3.2.2	Aaron Patterson	2012-03-01	1	-1/+1
\|
*	updating RAILS_VERSION	Aaron Patterson	2012-02-22	1	-2/+2
\|
*	format lookup for partials is derived from the format in which the template ↵	Santiago Pastorino	2012-02-22	1	-2/+2
\| \| \| \| \| \|	is being rendered Closes #5025 part 2
*	updating RAILS_VERSION	Xavier Noria	2012-01-26	1	-1/+1
\|
*	Preparing for 3.2.0 release	David Heinemeier Hansson	2012-01-20	1	-1/+1
\|
*	Bump to rc2	Santiago Pastorino	2012-01-04	1	-1/+1
\|
*	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
\|