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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #18206 from kamipo/dump_default_nil_for_postgresql_uuid_pr...	Yves Senn	2014-12-26	3	-1/+11
\|\
\| *	Dump the default `nil` for PostgreSQL UUID primary key.	Ryuta Kamizono	2014-12-26	3	-1/+11
\|/
*	Merge pull request #18205 from vipulnsward/fix-railties-warning	Guillermo Iguaran	2014-12-26	1	-3/+3
\|\
\| *	- Changed `paths` to `routing_paths` to avoid warning `possible reference to ...	Vipul A M	2014-12-26	1	-3/+3
\|/
*	Merge pull request #18197 from vipulnsward/fix-ar-2-2warning	Guillermo Iguaran	2014-12-26	1	-2/+2
\|\
\| *	- Changed `target` to `target_reflection` to avoid warning `possible referenc...	Vipul A M	2014-12-25	1	-2/+2
* \|	Merge pull request #18203 from kyledecot/ruby-2.2	Guillermo Iguaran	2014-12-26	1	-1/+1
\|\ \
\| * \|	targeting 2.2	Kyle Decot	2014-12-25	1	-1/+1
* \| \|	Merge pull request #18204 from chocoby/remove-double-space	Guillermo Iguaran	2014-12-26	1	-1/+1
\|\ \ \
\| * \| \|	Remove unnecessary double space	Kenta Okamoto	2014-12-26	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #18194 from claudiob/remove-action-controller-model-naming	Guillermo Iguaran	2014-12-25	2	-16/+0
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Remove ActionController::ModelNaming	claudiob	2014-12-25	2	-16/+0
* \| \|	Add example to get Errored test to pass in Testing guide [ci skip]	Zachary Scott	2014-12-25	1	-0/+13
\| \|/ \|/\|
* \|	Merge pull request #18196 from PavelPenkov/rails_env_instead_of_rails	Matthew Draper	2014-12-26	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Check for Rails.env instead of Rails	Pavel Penkov	2014-12-25	1	-1/+1
\|/
*	Merge pull request #18185 from ivalkeen/add_missing_guides	Zachary Scott	2014-12-24	1	-0/+5
\|\
\| *	List the Active Support Instrumentation guide in the index (as WIP)	Ivan Tkalin	2014-12-24	1	-0/+5
* \|	Correct grammar to fix #18182 [ci skip]	Zachary Scott	2014-12-24	1	-1/+1
* \|	Merge pull request #18190 from ef718/master	Zachary Scott	2014-12-24	1	-1/+1
\|\ \
\| * \|	Update grammar [ci skip]	Elaine Fang	2014-12-24	1	-1/+1
\| \|/
* /	Fix a few typos [ci skip]	Robin Dupret	2014-12-24	2	-5/+6
\|/
*	Merge pull request #18183 from danbernier/master	Arun Agrawal	2014-12-24	1	-1/+1
\|\
\| *	Fix bug in ActionMailer guide.	Dan Bernier	2014-12-24	1	-1/+1
\|/
*	Merge pull request #18107 from mkdynamic/add-reply-to-mail-to	Sean Griffin	2014-12-24	2	-4/+5
\|\
\| *	Add support for Reply-To field in mail_to helper	Mark Dodwell	2014-12-20	2	-4/+5
* \|	Merge pull request #18180 from vipulnsward/remove-unnecessary-name-passing	Sean Griffin	2014-12-24	1	-4/+4
\|\ \
\| * \|	- Removed unused parameter to cookie serialize method and fixed usage of the ...	Vipul A M	2014-12-24	1	-4/+4
\|/ /
* \|	Merge pull request #18159 from M7/docs-active_record-update_query_method_docs...	Sean Griffin	2014-12-23	1	-1/+1
\|\ \
\| * \|	Clarify that query methods have a custom definition of whether a numeric valu...	Michael D.W. Prendergast	2014-12-23	1	-2/+2
\| * \|	Clarify that the word present refers to Object#present?. [ci skip]	Michael D.W. Prendergast	2014-12-23	1	-36/+2
\| * \|	Update Active Record's attribute query methods documentation to describe its ...	Michael D.W. Prendergast	2014-12-22	1	-2/+36
* \| \|	removes superfluous regexp group	Xavier Noria	2014-12-23	1	-1/+1
* \| \|	warn about reading guides in GitHub	Xavier Noria	2014-12-23	48	-0/+96
* \| \|	third test to warn against reading guides in GitHub	Xavier Noria	2014-12-23	2	-2/+2
* \| \|	second test to warn against reading guides in GitHub	Xavier Noria	2014-12-23	2	-3/+2
* \| \|	proof of concept, need to check in GitHub	Xavier Noria	2014-12-23	2	-0/+4
* \| \|	Merge pull request #18174 from bogdan/cleanup_has_many_though_association_count	Sean Griffin	2014-12-23	1	-15/+0
\|\ \ \
\| * \| \|	Remove unneeded special case to calculate size for has_many :through	Bogdan Gusiev	2014-12-23	1	-15/+0
* \| \| \|	Merge pull request #18170 from tgxworld/add_docs_for_rails_application_secrets	Sean Griffin	2014-12-23	1	-1/+15
\|\ \ \ \
\| * \| \| \|	Rails::Application#secrets should be documented.	Guo Xiang Tan	2014-12-24	1	-1/+15
* \| \| \| \|	Don't treat `nil` as changed in serialized types	Sean Griffin	2014-12-23	2	-1/+9
* \| \| \| \|	Refactor a common class to reduce the duplication for `references`	Sean Griffin	2014-12-23	2	-59/+86
* \| \| \| \|	Fix syntax warning	Sean Griffin	2014-12-23	1	-1/+1
* \| \| \| \|	Merge pull request #18167 from al2o3cr/checkin_connection_leak	Sean Griffin	2014-12-23	2	-4/+36
\|\ \ \ \ \
\| * \| \| \| \|	Fix connection leak when a thread checks in additional connections.	Matt Jones	2014-12-23	2	-4/+36
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #18166 from merongivian/search_field_refactor	Sean Griffin	2014-12-23	2	-10/+12
\|\ \ \ \ \
\| * \| \| \| \|	Remove block from super	Jose Añasco	2014-12-23	2	-10/+12
* \| \| \| \| \|	Changelog for 99a6f9e60ea55924b44f894a16f8de0162cf2702	Sean Griffin	2014-12-23	1	-0/+6
* \| \| \| \| \|	Merge pull request #18145 from georgemillo/patch-2	Sean Griffin	2014-12-23	1	-0/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add information about "allow_destroy" requiring an ID. [ci skip]	George Millo	2014-12-23	1	-0/+3