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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	Merge pull request #22643 from Gaurav2728/gaurav-correct_doc_in_action_cable	Rafael França	2015-12-17	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	traditional make sense with `<tt>ActiveSupport::TaggedLogging</tt>`
\| * \| \| \| \| \| \|	traditional make sense with `<tt>ActiveSupport::TaggedLogging</tt>`	Gaurav Sharma	2015-12-18	1	-2/+2
\|/ / / / / / /
* / / / / / /	Call the new point behavior `:point`, not `:rails_5_1_point`	Sean Griffin	2015-12-17	3	-7/+6
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the attributes API is new in Rails 5, we don't actually need to keep the behavior of `attribute :point`, as it's not a breaking change.
* \| \| \| \| \|	Merge pull request #22640 from nateberkopec/fix-my-typo-and-clarify	Rafael França	2015-12-17	1	-8/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify thread_mattr_accessor subclass behavior documentation
\| * \| \| \| \| \|	Clarify thread_mattr_accessor subclass behavior documentation	Nate Berkopec	2015-12-17	1	-8/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge pull request #22637 from arunagw/aa-add-actioncable-to-build-step	Rafael França	2015-12-17	1	-4/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add actioncable to build step for release
\| * \| \| \| \| \| \|	Use FRAMEWORKS constant from `tasks/release` to avoid duplication	Arun Agrawal	2015-12-17	1	-4/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Use released turbolinks in the test suite	Rafael Mendonça França	2015-12-17	2	-10/+4
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Copy-edit the Per Thread attribute accessor documentation	Rafael Mendonça França	2015-12-17	1	-3/+3
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge pull request #22638 from lpaulmp/patch-1	Abdelkader Boudih	2015-12-17	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update USAGE [ci skip]
\| * \| \| \| \| \|	Update USAGE	Paul Montero	2015-12-17	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo
* \| \| \| \| \|	Use Thread.current.thread_variable_set/get insetad of the direct accessors	David Heinemeier Hansson	2015-12-17	1	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #22634 from arunagw/api-doc-for-actioncable	Rafael França	2015-12-17	1	-0/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate API doc for actioncable
\| * \| \| \| \| \|	Generate API doc for actioncable	Arun Agrawal	2015-12-17	1	-0/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #22636 from nateberkopec/fix-dhh-typo	Rafael França	2015-12-17	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in thread_mattr_accessor doco [ci skip]
\| * \| \| \| \| \| \|	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]
\| * \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Add thread_m/cattr_accessor/reader/writer suite of methods for declaring class and module variables that live per-thread
\| * \| \| \| \| \|	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 ↵	David Heinemeier Hansson	2015-12-17	5	-0/+302
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	class and module variables that live per-thread
* \| \| \| \| \| \|	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
\| * \| \| \| \| \| \|	README.rdoc -> README.md for newly generated plugins	yuuji.yaginuma	2015-12-17	7	-9/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I think Markdown is nowadays a better default.
* \| \| \| \| \| \| \|	Merge pull request #22629 from ↵	Rafael França	2015-12-17	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prathamesh-sonpatki/kill-extra-line-in-manifest-js Kill extra newline at the start of generated manifest.js
\| * \| \| \| \| \| \| \|	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]
\| * \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveRecord -> Active Record [ci skip]
* \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \|	Pass over the ApplicationRecord changelog entry	Genadi Samokovarov	2015-12-17	1	-10/+5
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The changelog entry for ApplicationRecord was a bit confusing. Thank you guys for helping me get it in a better shape. [ci skip]
* \| \| \| \| \| \|	Merge pull request #22626 from ↵	David Heinemeier Hansson	2015-12-17	14	-162/+182
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gsamokovarov/appliation-record-documentation-fixes Appliation record documentation fixes
\| * \| \| \| \| \| \|	ApplicationRecord release notes entry	Genadi Samokovarov	2015-12-17	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	ApplicationRecord documentation pass	Genadi Samokovarov	2015-12-17	13	-162/+163
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a pass over the documentation which fills the missing gaps of `ApplicationRecord`. [ci skip]
* \| \| \| \| \| \|	Merge pull request #22586 from rails/merge-action-cable	David Heinemeier Hansson	2015-12-17	89	-22/+3678
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Merge Action Cable into master
\| * \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we require you to enable it on the client-side, let us do the same on the server-side. Then you’re not running an EventMachine unless you need to.
\| * \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rack::Server already does it work for us if the server is installed.
\| * \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Still missing the stuff in app/ – we need to basically switch from a * match to specifically picking out what we need.
\| * \| \| \| \| \|	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
\| \| \| \| \| \| \|