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

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix typo in thread_mattr_accessor doco [ci skip]	Nate Berkopec	2015-12-17	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #22635 from arunagw/add-actioncable-to-release-list	Kasper Timm Hansen	2015-12-17	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add actioncable to list of release frameworks [ci skip]	Arun Agrawal	2015-12-17	1	-1/+1
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #22630 from rails/attribute-accessors-per-thread	David Heinemeier Hansson	2015-12-17	5	-0/+302
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Use separate test class name	David Heinemeier Hansson	2015-12-17	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \|	Use consistent references	David Heinemeier Hansson	2015-12-17	1	-3/+3
\| * \| \| \| \| \| \| \| \| \| \|	Add thread_m/cattr_accessor/reader/writer suite of methods for declaring clas...	David Heinemeier Hansson	2015-12-17	5	-0/+302
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #22068 from y-yagi/change_default_to_markdown	Rafael França	2015-12-17	7	-9/+13
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	README.rdoc -> README.md for newly generated plugins	yuuji.yaginuma	2015-12-17	7	-9/+13
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #22629 from prathamesh-sonpatki/kill-extra-line-in-manifes...	Rafael França	2015-12-17	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Kill extra newline at the start of generated manifest.js	Prathamesh Sonpatki	2015-12-17	1	-1/+0
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #22632 from prathamesh-sonpatki/fix-upgrading-guide	Rafael França	2015-12-17	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix section about ApplicationRecord in upgrading guide [ci skip]	Prathamesh Sonpatki	2015-12-17	1	-4/+4
\| \| \|_\|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Update README.md	Xavier Noria	2015-12-17	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #22621 from akshay-vishnoi/add-missing-tests	Richard Schneeman	2015-12-17	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add missing test cases for asset_path	Akshay Vishnoi	2015-12-17	1	-0/+2
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Puma 2.15.3 actually works fine	David Heinemeier Hansson	2015-12-17	1	-1/+1
\| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Deal with leading CR when its not a mountable engine	David Heinemeier Hansson	2015-12-17	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \|	Include example of allowed_request_origins	David Heinemeier Hansson	2015-12-17	1	-1/+2
\| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #22624 from gsamokovarov/application-record-changelog	David Heinemeier Hansson	2015-12-17	1	-10/+5
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Pass over the ApplicationRecord changelog entry	Genadi Samokovarov	2015-12-17	1	-10/+5
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #22626 from gsamokovarov/appliation-record-documentation-f...	David Heinemeier Hansson	2015-12-17	14	-162/+182
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	ApplicationRecord release notes entry	Genadi Samokovarov	2015-12-17	1	-0/+19
\| * \| \| \| \| \| \| \| \| \| \| \|	ApplicationRecord documentation pass	Genadi Samokovarov	2015-12-17	13	-162/+163
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #22586 from rails/merge-action-cable	David Heinemeier Hansson	2015-12-17	89	-22/+3678
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix tests	David Heinemeier Hansson	2015-12-17	1	-2/+0
\| * \| \| \| \| \| \| \| \| \| \|	Don't mount the ActionCable server by default	David Heinemeier Hansson	2015-12-17	2	-2/+2
\| * \| \| \| \| \| \| \| \| \| \|	No longer uses keep now that we have ApplicationRecord	David Heinemeier Hansson	2015-12-16	1	-1/+0
\| * \| \| \| \| \| \| \| \| \| \|	Fix test	David Heinemeier Hansson	2015-12-16	1	-1/+10
\| * \| \| \| \| \| \| \| \| \| \|	No need to check for puma	Rafael Mendonça França	2015-12-16	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \|	Fix test now that cable is in there by default too	David Heinemeier Hansson	2015-12-16	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \|	Quiet warnings	David Heinemeier Hansson	2015-12-16	1	-2/+2
\| * \| \| \| \| \| \| \| \| \| \|	Avoid Action Cable stubs on --skip-action-cable	David Heinemeier Hansson	2015-12-16	3	-3/+7
\| * \| \| \| \| \| \| \| \| \| \|	No longer needed now that we prefill with app/models/application_record.rb	David Heinemeier Hansson	2015-12-16	1	-1/+0
\| * \| \| \| \| \| \| \| \| \| \|	Clarify	David Heinemeier Hansson	2015-12-16	1	-3/+3
\| * \| \| \| \| \| \| \| \| \| \|	Generate all the ApplicationCable stubs by default, like all other Applicatio...	David Heinemeier Hansson	2015-12-16	8	-38/+16
\| * \| \| \| \| \| \| \| \| \| \|	Saner increments	David Heinemeier Hansson	2015-12-16	1	-3/+3
\| * \| \| \| \| \| \| \| \| \| \|	Use puma as the default development server, if available	David Heinemeier Hansson	2015-12-16	2	-4/+4
\| * \| \| \| \| \| \| \| \| \| \|	Comment out the user handling so default setup connects directly	David Heinemeier Hansson	2015-12-16	1	-18/+18
\| * \| \| \| \| \| \| \| \| \| \|	Eager loading is required for Action Cable and we should use the logging too	David Heinemeier Hansson	2015-12-16	1	-0/+4
\| * \| \| \| \| \| \| \| \| \| \|	Only mount the ActionCable server if ApplicationCable has been defined	David Heinemeier Hansson	2015-12-16	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \|	By default, mount Action Cable on the router	David Heinemeier Hansson	2015-12-16	1	-0/+3
\| * \| \| \| \| \| \| \| \| \| \|	Add default redis config for Action Cable	David Heinemeier Hansson	2015-12-16	2	-0/+9
\| * \| \| \| \| \| \| \| \| \| \|	Cargo cult fix to make Celluloid behave	David Heinemeier Hansson	2015-12-16	1	-0/+3
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into merge-action-cable	Rafael Mendonça França	2015-12-16	54	-407/+485
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Only include action cable meta tags if it is not skipped	Rafael Mendonça França	2015-12-16	1	-0/+2
\| * \| \| \| \| \| \| \| \| \| \| \|	Needless whitespace	David Heinemeier Hansson	2015-12-16	1	-2/+0
\| * \| \| \| \| \| \| \| \| \| \| \|	Include the action cable URL meta tag by default	David Heinemeier Hansson	2015-12-16	1	-1/+3
\| * \| \| \| \| \| \| \| \| \| \| \|	Require tree	David Heinemeier Hansson	2015-12-16	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \|	Simpler directory structure	David Heinemeier Hansson	2015-12-16	1	-2/+2