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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #13072 from kuldeepaggarwal/unwanted-code	Xavier Noria	2013-11-27	1	-2/+5
\|\
\| *	unnecessary checking of `size` with `second regex` if matched with first one	Kuldeep Aggarwal	2013-11-27	1	-2/+5
* \|	Merge pull request #13067 from sagarjunnarkar/getting_started	Carlos Antonio da Silva	2013-11-27	1	-0/+1
\|\ \
\| * \|	Link for "New Post" is added in Getting Started guide [ci skip]	Sagar Junnarkar	2013-11-27	1	-0/+1
* \| \|	Merge pull request #13068 from chancancode/drop_yajl_from_gemfile	Carlos Antonio da Silva	2013-11-27	1	-1/+0
\|\ \ \
\| * \| \|	Dropped yajl from Gemfile	Godfrey Chan	2013-11-26	1	-1/+0
\| \|/ /
* \| \|	Merge pull request #13069 from chancancode/json_gem_version	Carlos Antonio da Silva	2013-11-27	2	-2/+6
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Requires JSON gem version 1.7.7 or above as it contains an important	Godfrey Chan	2013-11-26	2	-2/+6
\| \|/
* \|	Merge pull request #13071 from kuldeepaggarwal/documentation-updation	Yves Senn	2013-11-27	1	-3/+0
\|\ \
\| * \|	[ci skip]removed obsolete information about `options` parameter in create method	Kuldeep Aggarwal	2013-11-27	1	-3/+0
\|/ /
* \|	Merge pull request #13070 from kuldeepaggarwal/documentation-updation	Yves Senn	2013-11-27	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	[ci skip] used new syntax for scopes	Kuldeep Aggarwal	2013-11-27	1	-1/+1
\|/
*	Merge pull request #13061 from laurocaetano/fix-uniqueness-validation-for-ali...	Rafael Mendonça França	2013-11-26	3	-1/+23
*	Merge pull request #12183 from chancancode/json_encoder_refactor	Jeremy Kemper	2013-11-26	3	-113/+107
\|\
\| *	Be explicit and use the actual unicode sequence	Godfrey Chan	2013-11-26	1	-1/+1
\| *	Process::Status should get a :nodoc: [ci skip]	Godfrey Chan	2013-11-26	1	-1/+1
\| *	Make the JSON encoder pluggable	Godfrey Chan	2013-11-26	1	-2/+8
\| *	Removed the Ruby encoder and switched to using the JSON gem	Godfrey Chan	2013-11-26	3	-82/+74
\| *	Removed support for encoding BigDecimal as a JSON number	Godfrey Chan	2013-11-26	3	-25/+1
\| *	Expanded coverage on JSON encoding	Godfrey Chan	2013-11-26	1	-2/+12
\| *	Added some failing tests where the JSON encoder is not resolving as_json corr...	Godfrey Chan	2013-11-26	1	-2/+12
* \|	More typo fixes	Akira Matsuda	2013-11-27	2	-2/+2
\|/
*	Minor typo fixes	Akira Matsuda	2013-11-27	4	-6/+6
*	Add branch to arel in Gemfile so that we can use local repos [ci skip]	Carlos Antonio da Silva	2013-11-26	1	-1/+1
*	Merge pull request #13018 from heruku/scoping_fix	Yves Senn	2013-11-26	4	-1/+19
\|\
\| *	changed update counter to act on unscoped model	heruku	2013-11-26	4	-1/+19
\|/
*	Merge pull request #13049 from senny/remove_firebird_tests	Rafael Mendonça França	2013-11-26	3	-148/+0
\|\
\| *	remove leftover firebird adapter tests.	Yves Senn	2013-11-26	3	-148/+0
* \|	sync example and documentation for strong_parameters hash whitelisting.	Yves Senn	2013-11-26	1	-5/+7
* \|	tyop	Akira Matsuda	2013-11-26	1	-1/+1
\|/
*	`rename_index`: add the new index before removing the old one.	Yves Senn	2013-11-26	3	-8/+29
*	Merge pull request #13042 from brianstorti/fix-dependent-destroy-12812	Rafael Mendonça França	2013-11-25	5	-1/+25
\|\
\| *	move changelog entry to the top	Brian Thomas Storti	2013-11-25	1	-6/+6
\| *	Raise `RecordNotDestroyed` when children can't be replaced	Brian Thomas Storti	2013-11-25	5	-1/+25
\|/
*	require the files we test	Aaron Patterson	2013-11-25	1	-0/+1
*	Merge pull request #13034 from vipulnsward/some_typos	Rafael Mendonça França	2013-11-25	2	-2/+2
\|\
\| *	Fix some minor typos [ci skip]	Vipul A M	2013-11-26	2	-2/+2
* \|	Revert "Merge pull request #13027 from akshay-vishnoi/f-refactor"	Carlos Antonio da Silva	2013-11-25	1	-1/+1
* \|	Merge pull request #13027 from akshay-vishnoi/f-refactor	Yves Senn	2013-11-25	1	-1/+1
\|\ \
\| * \|	avoiding calling of #option_value_selected? two times	Akshay Vishnoi	2013-11-25	1	-1/+1
* \| \|	Merge pull request #13029 from akshay-vishnoi/documentation	Yves Senn	2013-11-25	1	-4/+4
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	`delgated` => `delegated`	Akshay Vishnoi	2013-11-25	1	-4/+4
* \| \|	Merge pull request #13025 from pwnall/nice_test	Yves Senn	2013-11-25	3	-0/+19
\|\ \ \
\| * \| \|	Better error message for typos in assert_response argument.	Victor Costan	2013-11-25	3	-0/+19
\|/ / /
* \| \|	Merge pull request #13026 from vipulnsward/document_rewhere	Yves Senn	2013-11-24	1	-0/+26
\|\ \ \
\| * \| \|	Added `rewhere` usage to AR querying guides	Vipul A M	2013-11-25	1	-0/+26
\|/ / /
* \| \|	Merge pull request #13020 from razielgn/raise-inspectable-messages	Carlos Antonio da Silva	2013-11-24	2	-4/+4
\|\ \ \
\| * \| \|	Raise RuntimeErrors with inspectable and MRI-independent messages.	Federico Ravasio	2013-11-24	2	-4/+4
* \| \| \|	Merge remote-tracking branch 'docrails/master'	Xavier Noria	2013-11-24	29	-183/+203
\|\ \ \ \
\| * \| \| \|	a couple of copy-edits before merging [ci skip]	Xavier Noria	2013-11-24	1	-3/+2