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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \|	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
\|\ \ \ \ \
\| * \| \| \| \|	Fix default value in guide [ci skip]	Kohei Suzuki	2015-05-12	1	-1/+1
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #20111 from ankit8898/railtie_test_refac	Rafael Mendonça França	2015-05-11	2	-3/+0
\|\ \ \ \ \
\| * \| \| \| \|	removing unused and already required require's	Ankit Gupta	2015-05-11	2	-3/+0
\| \|/ / / /
* \| \| \| \|	remove mysterious file added with #20105 :sparkles:	Yves Senn	2015-05-11	1	-0/+0
* \| \| \| \|	Merge pull request #20105 from claudiob/rails31-is-out	Yves Senn	2015-05-11	2	-2/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	[ci skip] Fix comment, since Rails 3.1 is out	claudiob	2015-05-11	2	-2/+1
\|/ / / /
* \| \| \|	Merge pull request #20106 from claudiob/finder-rails3	Yves Senn	2015-05-11	1	-14/+2
\|\ \ \ \
\| * \| \| \|	[ci skip] Stop explaining finders for Rails 3	claudiob	2015-05-10	1	-14/+2
* \| \| \| \|	Merge pull request #20100 from claudiob/don-t-skip-rbx-test	Carlos Antonio da Silva	2015-05-10	1	-2/+0
\|\ \ \ \ \
\| * \| \| \| \|	Stop skipping a test that now works on Rubinius	claudiob	2015-05-10	1	-2/+0
\|/ / / / /
* \| \| \| \|	Merge pull request #20101 from imtayadeway/tw/active-record-querying-docs	Zachary Scott	2015-05-10	1	-2/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	[ci skip] Improve phrasing on #explain pretty printing.	Tim Wade	2015-05-10	1	-2/+3
\|/ / / /
* \| \| \|	Merge pull request #20099 from yui-knk/fix/comment_association_cache	Abdelkader Boudih	2015-05-10	1	-1/+1
\|\ \ \ \
\| * \| \| \|	[ci skip] Fix comment of `ActiveRecord::Associations#association_instance_get`	yui-knk	2015-05-11	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #20097 from ankit8898/refac_test_am	Santiago Pastorino	2015-05-10	2	-2/+0
\|\ \ \ \
\| * \| \| \|	not needed require's	Ankit Gupta	2015-05-10	2	-2/+0
\| \|/ / /
* \| \| \|	Merge pull request #20096 from yui-knk/fix/testing_guide	Eileen M. Uchitelle	2015-05-10	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	[ci skip] Fix purpose of `assert_kind_of`	yui-knk	2015-05-10	1	-1/+1
\|/ / /
* \| \|	Merge pull request #20094 from vngrs/refactor_railties_commands	Rafael Mendonça França	2015-05-10	4	-109/+103
\|\ \ \
\| * \| \|	Refactor railties console and dbconsole commands	Mehmet Emin İNAÇ	2015-05-10	4	-109/+103
\|/ / /
* \| \|	Merge pull request #20087 from kuldeepaggarwal/fix-engine-guides	Yves Senn	2015-05-09	1	-2/+2
\|\ \ \
\| * \| \|	[CI SKIP] correct error text message	kuldeepaggarwal	2015-05-09	1	-2/+2
* \| \| \|	Merge pull request #20086 from farukaydin/before-action-doc	Eileen M. Uchitelle	2015-05-09	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	promote :except option instead of :only for before action docs [ci skip]	Faruk AYDIN	2015-05-09	1	-1/+1
* \| \| \|	Move `TemplateAssertions` to their own file	eileencodes	2015-05-09	2	-188/+189
* \| \| \|	Merge pull request #20085 from y-yagi/improve_assert_emails_msg	Yves Senn	2015-05-09	3	-1/+17
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	`assert_emails` in block form use the given number as expected value	yuuji.yaginuma	2015-05-09	3	-1/+17
\|/ / /
* \| \|	Merge pull request #20081 from gouravtiwari/patch-3	Arun Agrawal	2015-05-08	1	-2/+2
\|\ \ \
\| * \| \|	minor rdoc syntax fix [ci skip]	Gourav Tiwari	2015-05-08	1	-2/+2
\|/ / /
* \| \|	Merge pull request #20079 from ankit8898/aj_all	Arun Agrawal	2015-05-08	1	-0/+1
\|\ \ \
\| * \| \|	docs: syncing with the code, adding aj [ci skip]	Ankit Gupta	2015-05-08	1	-0/+1
* \| \| \|	Merge pull request #20078 from robertjlooby/fix_generated_features_methods_docs	Rafael Mendonça França	2015-05-08	1	-1/+1
\|\ \ \ \
\| * \| \| \|	change GeneratedFeatureMethods to GeneratedAssociationMethods in docs	Rob Looby	2015-05-08	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #20064 from kddeisz/qu_provider_job_id	Rafael Mendonça França	2015-05-08	4	-9/+16
\|\ \ \ \
\| * \| \| \|	Provide provider_job_id to qu adapter.	Kevin Deisz	2015-05-07	4	-9/+16