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

	Commit message (Expand)	Author	Age	Files	Lines
...
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #126 from mikecarroll/add_allowed_request_origins_to_readme	David Heinemeier Hansson	2015-12-11	1	-3/+24
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add README.md instructions on configuring ActionCable.server.config.allowed_r...	Michael Carroll	2015-11-20	1	-3/+24
\| \| \| \|/ / / / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #133 from assimovt/master	David Heinemeier Hansson	2015-12-09	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update README find_verified_user example	Tair Assimov	2015-12-08	1	-1/+1
\| \| \|/ / / / / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #128 from ma2gedev/patch1	Rafael França	2015-12-03	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix typo	Takayuki Matsubara	2015-12-03	1	-1/+1
\| \| \|/ / / / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tune whitespace in README.md	Kasper Timm Hansen	2015-11-15	1	-5/+5
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #117 from rails/shared-constants	Javan Makhmali	2015-11-06	8	-27/+30
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Share internal identifiers and message types with the JavaScript client	Javan Makhmali	2015-11-06	8	-27/+30
\| \| \|/ / / / / / / / / / / / / / /
\| \| * / / / / / / / / / / / / / /	Missed updating a method name	Pratik Naik	2015-11-06	1	-1/+1
\| \| \|/ / / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename Subscription#reject! to Subscription#reject as there's only one versio...	Pratik Naik	2015-11-05	2	-3/+3
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #102 from rails/subscription-rejection	Pratik	2015-11-04	8	-17/+102
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some documentation explaining subscription rejection	Pratik Naik	2015-11-04	2	-0/+19
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a merge fail syntax issue	Pratik Naik	2015-11-04	1	-1/+1
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into subscription-rejection	Pratik Naik	2015-11-04	10	-50/+65
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure cable closes the connection if open when responding to an invalid r...	Pratik Naik	2015-11-04	2	-3/+12
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #113 from dballona/fix-subscription-callbacks	Jeremy Daer	2015-11-04	2	-3/+9
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing subscription callbacks	Diego Ballona	2015-11-04	2	-3/+9
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #106 from nobrick/master	Kasper Timm Hansen	2015-10-24	1	-2/+2
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary space in README [ci skip]	Ming Qu	2015-10-24	1	-2/+2
\| \| \|/ / / / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't ask an yanked celluloid version	Rafael Mendonça França	2015-10-23	1	-4/+4
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use our standard name for the Gemfile	Rafael Mendonça França	2015-10-23	2	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix travis matrix	Rafael Mendonça França	2015-10-23	1	-1/+2
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #69 from mieko/callbacks	Rafael Mendonça França	2015-10-23	4	-34/+29
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use ActiveSupport::Callbacks for Channel subscription callbacks.	Mike A. Owens	2015-08-24	4	-33/+34
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #84 from alexpeattie/nonstandard-logger-fix	Rafael França	2015-10-23	1	-3/+5
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix NoMethodError when using a custom Rails.logger class	Alex Peattie	2015-10-06	1	-3/+5
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #46 from rajcybage/readme_fix	Rafael França	2015-10-23	1	-0/+2
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] small description on readme for identified_by	Rajarshi Das	2015-07-30	1	-0/+2
\| \| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Better method names in Javascript based on the feedback from @javan	Pratik Naik	2015-10-22	2	-18/+19
\| \| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow rejecting subscriptions from the channel	Pratik Naik	2015-10-21	7	-10/+75
\| \| \| \|_\|_\|/ / / / / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the error message in tests	Pratik Naik	2015-10-19	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better test name	Pratik Naik	2015-10-19	1	-1/+1
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure the subscription confirmaion is only sent out once	Pratik Naik	2015-10-19	2	-2/+34
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #98 from rails/subscription-confirmation	Pratik	2015-10-19	8	-18/+76
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Freeze the SUBSCRIPTION_CONFIRMATION_INTERNAL_MESSAGE value	Pratik Naik	2015-10-19	1	-1/+1
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix an error message in the subscription tests	Pratik Naik	2015-10-16	1	-1/+1
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send subscription confirmation from server to the client to avoid race condit...	Pratik Naik	2015-10-16	8	-18/+76
\| \| \|/ / / / / / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix stream tests	Pratik Naik	2015-10-16	1	-2/+2
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cover stray deps for the logging convenience require	Jeremy Daer	2015-10-16	1	-0/+4
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'adjust-reconnect'	Jeremy Daer	2015-10-16	2	-23/+29
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tweak reconnect timing	Javan Makhmali	2015-10-14	1	-14/+15
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove immediate reconnect to help avoid thundering herd after server restarts	Javan Makhmali	2015-10-14	1	-4/+0
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid returning results of loop	Javan Makhmali	2015-10-14	1	-0/+1
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add delay before reopening	Javan Makhmali	2015-10-14	1	-2/+9
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve guard against opening multiple web sockets	Javan Makhmali	2015-10-14	1	-3/+4
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #97 from lsylvester/speed-up-tests	Jeremy Daer	2015-10-16	1	-1/+2
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up tests be calling EM.run_deferred_callbacks instead of setting a timer	Lachlan Sylvester	2015-10-17	1	-1/+2
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Devolve blanket #require to reveal intent and responsibility	Jeremy Daer	2015-10-16	18	-76/+103
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test against Rails edge by default. CI against 4.2 also.	Jeremy Daer	2015-10-16	6	-38/+84