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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #35582 from vipulnsward/kill-warning-from-guides	Kasper Timm Hansen	2019-03-12	1	-1/+1
\|\ \| \| \| \|	Fix warnings from Guides generation
\| *	After https://github.com/rails/rails/pull/35281 and ↵	Vipul A M	2019-03-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/rails/rails/pull/35036 AV warns about not having the compiled container. Use the suggested with_empty_template_cache to overcome warning
* \|	Merge pull request #35530 from Rodrigora/patch-1	Vipul A M	2019-03-12	1	-0/+11
\|\ \ \| \|/ \|/\|	Add note about has_many associations callbacks [ci skip]
\| *	Add note about has_many associations callbacks [ci skip]	Rodrigo	2019-03-12	1	-0/+11
\| \| \| \| \| \| \| \|	Add a note explaining when the has_many associations callbacks will be called or not.
* \|	Merge pull request #34955 from bogdanvlviv/follow-up-33962	Kasper Timm Hansen	2019-03-11	1	-0/+4
\|\ \ \| \| \| \| \| \|	Add `config.credentials.content_path` and `config.credentials.key_path` to the guide
\| * \|	Add `config.credentials.content_path` and `config.credentials.key_path` to ↵	bogdanvlviv	2019-01-17	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the guide - Fix some typos Follow up #33962
* \| \|	[ci skip] Removed extra hyphens	Shailesh Kalamkar	2019-03-11	1	-4/+4
\| \| \|
* \| \|	Add example of the output of `rails routes --expanded` in the routing guide ↵	Prathamesh Sonpatki	2019-03-11	1	-1/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] - Instead of the note at the end, added an example of how the output looks by using the expanded switch.
* \| \|	Fix links in gemspec and docs from http to https.	Abhay Nikam	2019-03-09	7	-17/+17
\| \| \|
* \| \|	Merge pull request #35529 from ↵	Ryuta Kamizono	2019-03-09	3	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	abhaynikam/35492-follow-up-to-updates-links-to-https Updated links from http to https in guides, docs, etc
\| * \| \|	Updated links from http to https in guides, docs, etc	Abhay Nikam	2019-03-09	3	-3/+3
\| \| \|/ \| \|/\|
* \| \|	[ci skip] Minor documentation fixes for consistency	Shailesh Kalamkar	2019-03-09	2	-2/+2
\| \| \|
* \| \|	Guides: Fix parent class of model test example (#35065)	Sean Abrahams	2019-03-09	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix parent class of model test example * include ActiveJob::TestHelper [ci skip]
* \| \|	- Remove the word painfully from documentation	iarobinson	2019-03-08	1	-1/+1
\|/ /
* \|	Update `multiline?` sample code [ci skip]	soartec-lab	2019-03-07	1	-2/+2
\| \|
* \|	Corrected execution result of Enumerable#sum [ci skip]	soartec-lab	2019-03-07	1	-1/+1
\| \|
* \|	Learn more about inflections[ci skip]	soartec-lab	2019-03-07	1	-1/+1
\| \|
* \|	Merge pull request #35503 from samjohn/cannot-grammar-correction	Xavier Noria	2019-03-07	1	-1/+1
\|\ \ \| \| \| \| \| \|	Replace “can not” with “cannot”.
\| * \|	Replace “can not” with “cannot”.	Samantha John	2019-03-06	1	-1/+1
\| \| \|
* \| \|	Fix incorrect identifier quoting [ci skip]	Ryuta Kamizono	2019-03-07	1	-3/+3
\| \| \|
* \| \|	Correct the limitation about `order` with `distinct` in the guide	Ryuta Kamizono	2019-03-07	1	-1/+2
\|/ / \| \| \| \| \| \| \| \| \| \| \| \|	That is happened with `distinct`, and that is not only happened on MyS L, but also on PostgreSQL, SQL Server, and Oracle. [ci skip]
* \|	Update links and code examples in the guides to use HTTPS where the host ↵	Nathaniel Suchy	2019-03-06	30	-109/+109
\| \| \| \| \| \| \| \|	supports it.
* \|	Fix guide to use correct number of files created by controller generator	rmacklin	2019-03-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In e8546aba904fb6685ef2e61f1623c64e699a2c9c, the Getting Started guide was updated to reflect the removal of CoffeeScript stubs being generated by the controller generator. However, the comment above the table of generated files wasn't updated, so it incorrectly remained "This creates five files and one empty directory". This fixes it to now say "This creates four files and one empty directory".
* \|	Merge pull request #33611 from willianveiga/feature/reselect-method	Andrew White	2019-03-01	1	-0/+26
\|\ \ \| \| \| \| \| \|	Add reselect method
\| * \	Merge branch 'master' into feature/reselect-method	Willian Gustavo Veiga	2018-10-22	10	-50/+122
\| \|\ \
\| * \ \	Merge branch 'master' into feature/reselect-method	Willian Gustavo Veiga	2018-10-17	4	-14/+14
\| \|\ \ \
\| * \ \ \	Merge branch 'master' into feature/reselect-method	Willian Gustavo Veiga	2018-10-11	12	-47/+64
\| \|\ \ \ \
\| * \| \| \| \|	Mention reselect new method in the "Active Record Query Interface" guide	Willian Gustavo Veiga	2018-10-04	1	-0/+26
\| \| \| \| \| \|
* \| \| \| \| \|	add note about idle connection reaper to 5.2 release notes	Zach Walton	2019-02-27	1	-0/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Preparing for 6.0.0.beta2 release	Rafael Mendonça França	2019-02-25	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	How to use `select` is updated [ci skip]	soartec-lab	2019-02-24	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #35367 from ↵	Rafael França	2019-02-22	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	abhaynikam/update-getting-started-doc-for-migration-version-in-rails-6 Update migration version to 6.0 in the getting started doc [ci skip]
\| * \| \| \| \| \|	[ci skip] Updated migration version to 6.0 in the getting started docs	Abhay Nikam	2019-02-22	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	update callbacks skipping methods in guide [ci skip]	Shivam Jain	2019-02-23	1	-3/+2
\|/ / / / / /
* \| \| \| \| \|	[ci skip] Updated the documentation for bulk delete in activerecord	Abhay Nikam	2019-02-20	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Replaced usage of where.delete/destroy_all with delete/destroy_by	Abhay Nikam	2019-02-20	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Revert "Merge pull request #35324 from sharang-d/patch-2"	Ryuta Kamizono	2019-02-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 6b69ae5149f03c2f81a795c085bce56ec18535ae, reversing changes made to 84bd9adafde36d0192849649b86ffcd4e59e5e11. Reason: We already use "happen" a lots for callbacks and validations. https://github.com/rails/rails/pull/35324#issuecomment-465096483 [ci skip]
* \| \| \| \| \|	Update active_record_callbacks.md [ci skip]	Sharang Dashputre	2019-02-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change 'happen' to a more technical term
* \| \| \| \| \|	Delete documentation inconsistency 'finally' for AR callbacks [ci skip] ↵	Shodai Suzuki	2019-02-19	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(#35303)
* \| \| \| \| \|	Add combining callback conditions [skip ci] (#35313)	Shodai Suzuki	2019-02-19	1	-0/+14
\| \| \| \| \| \|
* \| \| \| \| \|	Reword RDBMS note in ActiveRecord basics	Gannon McGibbon	2019-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge pull request #35034 from sponomarev/chore/ac-docs-worker-pool	Eileen M. Uchitelle	2019-02-12	2	-5/+18
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Worker Pool section to Action Cable configuration docs
\| * \| \| \| \| \|	Add Worker Pool section to Action Cable configuration docs	Sergey Ponomarev	2019-02-01	2	-5/+18
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Revert "Merge pull request #35216 from CHTJonas/patch-1"	Ryuta Kamizono	2019-02-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit b46601b56d94a02d944ed9bd9494aeea9cba98c8, reversing changes made to 4e6737f18ab8f0d0e9fbe6f73a92e5d29f1c68f1.
* \| \| \| \| \| \|	Merge pull request #35216 from CHTJonas/patch-1	Eileen M. Uchitelle	2019-02-11	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct JavaScript guide example
\| * \| \| \| \| \| \|	Correct JavaScript example in guide [ci skip]	Charlie Jonas	2019-02-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Swap `#users` jQuery selector to correct position and prevent the escaping of HTML.
* \| \| \| \| \| \| \|	Fix typo a -> an, an -> a [ci skip]	Ryuta Kamizono	2019-02-11	2	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Revert "Merge pull request #33563 from lzap/foreign-key-note-doc"	Ryuta Kamizono	2019-02-11	1	-3/+0
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 141f50ef9ee6ce26820549e9f5b4629ddee182ce, reversing changes made to 317efa5c3593b70e9cc9a2fcb67488a302b71731. Reason: `add_foreign_key` and `remove_foreign_key` are implemented at #35212. [ci skip]
* \| \| \| \| \| \|	Remove finalizer and configuration	Aaron Patterson	2019-02-06	1	-7/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Respect ENV variables when finding DBs etc for the test suite	Matthew Draper	2019-02-06	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If they're not set we'll still fall back to localhost, but this makes it possible to run the tests against a remote Postgres / Redis / whatever.