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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #11760 from rahul100885/master	Rafael Mendonça França	2013-08-05	1	-0/+1
\|\
\| *	Added data for permit array into scalar value	Rahul P. Chaudhari	2013-08-05	1	-0/+1
* \|	Merge pull request #11757 from ryog/fix_document_active_model_errors	Rafael Mendonça França	2013-08-05	1	-4/+4
\|\ \ \| \|/ \|/\|
\| *	Fix: documentation for ActiveModel::Errors	Ryoji Yoshioka	2013-08-05	1	-4/+4
\|/
*	Merge pull request #11751 from rmm5t/assert_dom_equal-message	Rafael Mendonça França	2013-08-04	2	-4/+11
\|\
\| *	Pass assert_dom_equal message arg to underlying assertion	Ryan McGeary	2013-08-04	2	-4/+11
* \|	Add CHANGELOG entry for #11665	Rafael Mendonça França	2013-08-04	1	-0/+4
* \|	Merge pull request #11665 from mshytikov/fix-config-log_level	Rafael Mendonça França	2013-08-04	3	-2/+11
\|\ \
\| * \|	fix tests	Max Shytikov	2013-07-30	1	-1/+1
\| * \|	Rails.logger should have level specified by config.log_level.	Max Shytikov	2013-07-30	2	-1/+10
* \| \|	Merge pull request #11677 from jaggederest/master	Rafael Mendonça França	2013-08-04	1	-1/+1
\|\ \ \
\| * \| \|	remove language about configuring digest method [ci skip]	Justin George	2013-07-31	1	-1/+1
\| * \| \|	update guide to reflect default HMAC SHA1 in MessageVerifier used in SignedCo...	Justin George	2013-07-30	1	-1/+1
* \| \| \|	Merge pull request #11693 from egilburg/minor_relation_refactor	Rafael Mendonça França	2013-08-04	1	-38/+45
\|\ \ \ \
\| * \| \| \|	Minor optimization and code cleanup in query_methods.	Eugene Gilburg	2013-07-31	1	-38/+45
* \| \| \| \|	Merge pull request #11749 from Alamoz/getting_started_guide	Rafael Mendonça França	2013-08-04	1	-0/+15
\|\ \ \ \ \
\| * \| \| \| \|	Added to 'Security' section; especially reference to 'Ruby on Rails Security ...	Adrien Lamothe	2013-08-04	1	-0/+15
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #11737 from tkhr/fix-document-about-on-validation-helpers	Rafael Mendonça França	2013-08-04	1	-3/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix active_record_validations.md document, `:save` for `on:` validation helpe...	Takehiro Adachi	2013-08-04	1	-3/+2
* \| \| \| \|	No need to use blocks here	Andrew White	2013-08-04	1	-11/+9
* \| \| \| \|	Fix unused variable warning	Andrew White	2013-08-04	1	-0/+1
* \| \| \| \|	Remove "Using Action View outside of Rails" section from AV overview guide	Guillermo Iguaran	2013-08-04	1	-69/+0
* \| \| \| \|	:scissors:	Rafael Mendonça França	2013-08-03	1	-3/+3
* \| \| \| \|	No need to abbreviate application	Rafael Mendonça França	2013-08-03	1	-1/+1
* \| \| \| \|	Merge pull request #11747 from bradly/guides_getting_started_fix	Rafael Mendonça França	2013-08-03	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Add note that you must be in the rails app directory when starting up the ser...	Bradly Feeley	2013-08-03	1	-1/+1
* \| \| \| \| \|	Merge pull request #11733 from iainbeeston/master	Rafael Mendonça França	2013-08-03	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Updated the guide to say that the localisation file for validation messages i...	Iain Beeston	2013-08-03	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #11600 from jasiek/master	Rafael Mendonça França	2013-08-03	1	-4/+6
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Removed an unnecessary loop - it kills performance on large texts.	Jan Szumiec	2013-08-03	1	-4/+6
* \| \| \| \| \| \|	Merge pull request #11738 from gaurish/guides-association-basics-fix	Rafael Mendonça França	2013-08-03	1	-2/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[Fixes #11734]Correct Association Basics Guide on has_and_belongs_to_many[ci ...	Gaurish Sharma	2013-08-03	1	-2/+3
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #11740 from Karunakar/self_table	Rafael Mendonça França	2013-08-03	1	-2/+2
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Changing the def self.table_name to self.table_name in the column_name.rb	Karunakar (Ruby)	2013-08-03	1	-2/+2
* \| \| \| \| \| \|	Merge pull request #11744 from Karunakar/minor_fix_on_flatmap	Rafael Mendonça França	2013-08-03	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	used flat_map instead of map.flatten in /guides/rails_guides/helpers.rb	Karunakar (Ruby)	2013-08-04	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #11707 from nathanstitt/extname_option	Rafael Mendonça França	2013-08-03	3	-3/+27
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add "extname" option to javascript_include_tag	Nathan Stitt	2013-08-03	3	-3/+27
* \| \| \| \| \| \| \|	Merge pull request #11741 from Karunakar/failing_test_in_local	Rafael Mendonça França	2013-08-03	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	fix for postgresql failing test in local	Karunakar (Ruby)	2013-08-04	1	-1/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #11730 from neerajdotname/use_flat_map	Yves Senn	2013-08-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	use flat_map	Neeraj Singh	2013-08-03	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #11736 from gaurish/avoid-multibyte-method-define	Guillermo Iguaran	2013-08-03	1	-3/+4
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Avoid calling define_method with non-english chars in InflectorTest	Gaurish Sharma	2013-08-03	1	-3/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #11735 from arunagw/av-warning-removed-master	Yves Senn	2013-08-03	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Using URI.parser.unescape	Arun Agrawal	2013-08-03	1	-2/+2
\|/ / / / /
* \| \| \| \|	Revert "Isolate railties Generators Tests"	Guillermo Iguaran	2013-08-02	1	-1/+0
* \| \| \| \|	Merge pull request #11726 from atambo/isolate_generator_tests	Guillermo Iguaran	2013-08-02	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	Isolate railties Generators Tests	Alex Tambellini	2013-08-02	1	-0/+1
\|/ / / / /
* \| \| \| \|	add a test for concat on hm:t associations	Aaron Patterson	2013-08-02	1	-0/+7