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

	Commit message (Expand)	Author	Age	Files	Lines
*	Divide methods for handling column options separately	Ryuta Kamizono	2015-05-18	2	-10/+34
*	Merge pull request #20173 from imtayadeway/tw/active-record-validations-docs	Kasper Timm Hansen	2015-05-16	1	-12/+12
\|\
\| *	[ci skip] Improve grammar/syntax in AR validations docs.	Tim Wade	2015-05-16	1	-12/+12
* \|	Merge pull request #20172 from prathamesh-sonpatki/changelog-pass	Arun Agrawal	2015-05-16	5	-9/+13
\|\ \
\| * \|	Pass over CHANGELOGS [ci skip]	Prathamesh Sonpatki	2015-05-16	5	-9/+13
\|/ /
* \|	Merge pull request #14938 from thedarkone/pool-lock-fix	Matthew Draper	2015-05-16	5	-92/+577
\|\ \ \| \|/ \|/\|
\| *	AR::ConPool - remove synchronization around connection cache.	thedarkone	2015-05-14	3	-84/+436
\| *	AR::ConPool - establish connections outside of critical section.	thedarkone	2015-05-14	3	-28/+136
\| *	AR::ConPool - reduce post checkout critical section.	thedarkone	2015-05-14	3	-14/+38
* \|	Merge pull request #20159 from vngrs/remove_unnecessary_set_requires	Santiago Pastorino	2015-05-14	3	-3/+0
\|\ \
\| * \|	Remove redundant require 'set' lines	Mehmet Emin İNAÇ	2015-05-15	3	-3/+0
* \| \|	Merge pull request #20160 from ankit8898/security-guide	Santiago Pastorino	2015-05-14	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Dead blog/site links [ci skip]	Ankit Gupta	2015-05-14	1	-1/+1
\|/ /
* \|	Merge pull request #20155 from y-yagi/remove_warning_from_integer_ext_test	Carlos Antonio da Silva	2015-05-14	1	-2/+2
\|\ \
\| * \|	remove warning from integer ext test	yuuji.yaginuma	2015-05-14	1	-2/+2
* \| \|	Merge pull request #20153 from nygrenh/remove-local_assigns-clutter	Matthew Draper	2015-05-14	4	-1/+14
\|\ \ \
\| * \| \|	Do not put partial name to local_assigns when rendering without an object	Henrik Nygren	2015-05-14	4	-1/+14
\| \|/ /
* \| \|	Merge pull request #20113 from claudiob/remove-rails31-refs	Yves Senn	2015-05-14	6	-34/+15
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	[ci skip] Remove comments about Rails 3.1	claudiob	2015-05-11	6	-34/+15
* \| \|	Merge pull request #20151 from imtayadeway/tw/active-record-migrations-docs	Zachary Scott	2015-05-13	1	-2/+2
\|\ \ \
\| * \| \|	[ci skip] Improve phrasing in AR migrations docs.	Tim Wade	2015-05-13	1	-2/+2
* \| \| \|	Merge pull request #20146 from karanarora/Doc-fixes	Claudio B.	2015-05-13	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Rails documentation standard is american english. [ci skip]	karanarora	2015-05-14	1	-1/+1
* \| \| \|	Merge pull request #20150 from karanarora/Typo-fix	Rafael Mendonça França	2015-05-13	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	remove redundant parenthesis	karanarora	2015-05-14	1	-1/+1
* \| \| \|	Merge pull request #20149 from karanarora/Typo-fix	Rafael Mendonça França	2015-05-13	1	-11/+11
\|\\| \| \|
\| * \| \|	remove redundant parenthesis.	karanarora	2015-05-14	1	-11/+11
\| \|/ /
* \| \|	Merge pull request #20142 from zoltankiss/comment_fix	Rafael Mendonça França	2015-05-13	1	-4/+4
\|\ \ \
\| * \| \|	Minor comment fix. [ci skip]	Zoltan Kiss	2015-05-13	1	-4/+4
\|/ / /
* \| \|	Add Integer#positive? and Integer#negative? query methods in the vein of Fixn...	David Heinemeier Hansson	2015-05-13	4	-0/+37
* \| \|	Remove not used `options` argument from `ActiveSupport::JSON.decode`	Carlos Antonio da Silva	2015-05-13	1	-8/+2
* \| \|	Merge pull request #20121 from matthewrudy/remove-sanitize-hash	Sean Griffin	2015-05-13	1	-3/+1
\|\ \ \
\| * \| \|	remove documentation for sanitize_sql_for_conditions with a Hash	Matthew Rudy Jacobs	2015-05-12	1	-2/+1
\| * \| \|	Remove call to sanitize_sql_hash_for_conditions	Matthew Rudy Jacobs	2015-05-12	1	-1/+0
* \| \| \|	invalid sti error message contains the full class name.	Yves Senn	2015-05-13	2	-1/+12
* \| \| \|	Merge branch 'sti-subclass-from-attributes' of https://github.com/agrobbin/ra...	Yves Senn	2015-05-13	4	-6/+23
\|\ \ \ \
\| * \| \| \|	allow setting of a demodulized class name when using STI	Alex Robbin	2015-05-11	4	-6/+23
* \| \| \| \|	Merge pull request #20136 from mcfiredrill/nodoc-postgresql-add-column	Yves Senn	2015-05-13	1	-3/+1
\|\ \ \ \ \
\| * \| \| \| \|	:nodoc: postgresql add_column	Tony Miller	2015-05-13	1	-3/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #20126 from drcapulet/master	Rafael Mendonça França	2015-05-13	3	-10/+31
\|\ \ \ \ \
\| * \| \| \| \|	Add full set of MySQL CLI options to support SSL authentication when using db...	Alex Coomans	2015-05-12	3	-10/+31
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #20131 from vngrs/missing_doc_about_assign_attribute	Rafael Mendonça França	2015-05-12	1	-1/+2
\|\ \ \ \ \
\| * \| \| \| \|	Add more detailed comment about _assign_attribute method [ci skip]	Mehmet Emin İNAÇ	2015-05-13	1	-1/+2
* \| \| \| \| \|	Merge pull request #20130 from vngrs/refactor_abstract_mysql_adabter_type_to_...	Rafael Mendonça França	2015-05-12	1	-21/+33
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Refactor abstract_mysql_adapter type_to_sql method	Mehmet Emin İNAÇ	2015-05-13	1	-21/+33
\|/ / / / /
* \| \| \| \|	Merge pull request #20128 from claudiob/remove-sudo	Rafael Mendonça França	2015-05-12	7	-7/+7
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	[ci skip] Don’t encourage `sudo gem install`	claudiob	2015-05-12	7	-7/+7
\|/ / / /
* \| \| \|	Merge pull request #20119 from yui-knk/fix/active_record_querying	Yves Senn	2015-05-12	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	[ci skip] Fix `transaction` code example	yui-knk	2015-05-12	1	-1/+1
* \| \| \|	Merge pull request #20112 from eagletmt/doc-fix	Rafael Mendonça França	2015-05-11	1	-1/+1
\|\ \ \ \