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

	Commit message (Expand)	Author	Age	Files	Lines
*	Avoid `pg` 1.1.0 for now	yuuji.yaginuma	2018-08-25	2	-3/+3
*	Merge pull request #33714 from cbothner/azure-service-swallowing-all-errors	George Claghorn	2018-08-24	2	-5/+14
\|\
\| *	Handle only specifically relevant Azure HTTPErrors	Cameron Bothner	2018-08-23	2	-5/+14
\|/
*	Revert "Merge pull request #33667 from cbothner/azure-service-swallowing-all-...	George Claghorn	2018-08-23	2	-20/+7
*	Merge pull request #33667 from cbothner/azure-service-swallowing-all-errors	George Claghorn	2018-08-23	2	-7/+20
\|\
\| *	Handle only specifically relevant Azure HTTPErrors	Cameron Bothner	2018-08-23	2	-7/+20
\|/
*	Merge pull request #33681 from minaslater/replace-white-and-blacklist	Aaron Patterson	2018-08-23	9	-40/+41
\|\
\| *	[ci skip] corrects more grammar awkwardness, replacing denylist with restrict...	Mina Slater	2018-08-22	9	-37/+41
\| *	[ci skip] revert terminology related to syntax	Mina Slater	2018-08-22	1	-1/+1
\| *	[ci skip] fixes a few more grammar issues, changing a to an before the word a...	Mina Slater	2018-08-22	4	-12/+9
\| *	[ci skip] fixes awkward grammar	Mina Slater	2018-08-22	6	-12/+12
\| *	[ci skip] change all instances of blacklist and whitelist to denylist and all...	Mina Slater	2018-08-21	11	-40/+40
* \|	Merge pull request #31696 from BrentWheeldon/bmw-connection-pool-load-deadlock	Matthew Draper	2018-08-24	2	-1/+41
\|\ \
\| * \|	Prevent deadlocks when waiting for connection from pool.	Brent Wheeldon	2018-03-23	2	-1/+41
* \| \|	Merge pull request #33703 from bogdanvlviv/follow-up-33659	George Claghorn	2018-08-23	5	-6/+17
\|\ \ \
\| * \| \|	DRY in `assert_broadcasts`	bogdanvlviv	2018-08-23	2	-2/+13
\| * \| \|	Simplify configuring of `ActionCable.server.config.logger` for actioncable tests	bogdanvlviv	2018-08-23	1	-1/+1
\| * \| \|	Set the test adapter for the test environment by default in `config/cable.yml`	bogdanvlviv	2018-08-23	1	-1/+1
\| * \| \|	Clarify api docs of ActionCable::SubscriptionAdapter::Test	bogdanvlviv	2018-08-23	2	-2/+2
* \| \| \|	Fix typo s/Topic/Tag/	Ryuta Kamizono	2018-08-23	1	-1/+1
* \| \| \|	Merge pull request #33704 from matthewd/helper-path-with-size	Matthew Draper	2018-08-23	1	-2/+1
\|\ \ \ \
\| * \| \| \|	Use string lengths instead of regexp to extract path	Matthew Draper	2018-08-23	1	-2/+1
* \| \| \| \|	Merge pull request #32647 from eugeneius/lazy_transactions	Matthew Draper	2018-08-23	17	-17/+185
\|\ \ \ \ \
\| * \| \| \| \|	Omit BEGIN/COMMIT statements for empty transactions	Eugene Kenny	2018-08-13	17	-17/+185
* \| \| \| \| \|	Merge pull request #33696 from bogdanvlviv/follow-up-44007c070	Kasper Timm Hansen	2018-08-23	4	-10/+10
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Use `say`/`error` instead of `puts`/`$stderr.puts`	bogdanvlviv	2018-08-22	4	-10/+10
* \| \| \| \| \|	Merge pull request #33666 from cbothner/fail-gracefully-from-activestorage-fi...	George Claghorn	2018-08-22	9	-18/+118
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Respond with 404 in ActiveStorage::DiskController#show when file missing	Cameron Bothner	2018-08-21	3	-0/+16
\| * \| \| \| \| \|	Translate service-specific missing object exceptions into a generic one	Cameron Bothner	2018-08-21	7	-18/+102
* \| \| \| \| \| \|	Include form_with in form_helpers rails guide (#33523)	Nick Schwaderer	2018-08-22	1	-53/+49
* \| \| \| \| \| \|	Merge pull request #33698 from bogdanvlviv/follow-up-33693	Rafael França	2018-08-22	1	-1/+0
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove extra execution of `uniq!` on action_methods	bogdanvlviv	2018-08-22	1	-1/+0
* \| \| \| \| \| \| \|	Merge pull request #33695 from peterzhu2118/master	Rafael França	2018-08-22	2	-8/+11
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update ParameterFilter to yield original parameters	Peter Zhu	2018-08-22	2	-8/+11
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #33693 from schneems/schneems/action_methods	Richard Schneeman	2018-08-22	1	-1/+4
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Two fewer array allocations on action_methods	schneems	2018-08-22	1	-1/+4
* \| \| \| \| \| \| \|	Merge pull request #33697 from bogdanvlviv/rails-command-help-show-description	Rafael França	2018-08-22	2	-2/+5
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix `rails initializers --help` and `rails dev:cache --help`	bogdanvlviv	2018-08-22	2	-2/+5
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #33685 from krusty3002/master	Rafael França	2018-08-22	1	-0/+7
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fixed file name [ci skip]	Claas Zurawski	2018-08-22	1	-1/+1
\| * \| \| \| \| \| \| \|	Added explanation about new_framework_defaults.rb file [ci skip]	Claas Zurawski	2018-08-22	1	-0/+7
* \| \| \| \| \| \| \| \|	Merge pull request #33694 from bogdanvlviv/follow-up-33631	Rafael França	2018-08-22	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove `rake initializers` from rake tasks list	bogdanvlviv	2018-08-22	1	-1/+0
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #33162 from utilum/stop_using_mocha	Kasper Timm Hansen	2018-08-22	11	-59/+200
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove Mocha from Gemfile	utilum	2018-08-13	2	-6/+0
\| * \| \| \| \| \| \|	Add method_call_assertions and use them instead of Mocha	utilum	2018-08-13	6	-36/+170
\| * \| \| \| \| \| \|	Stub with Minitest and test with MethodCallAssertions	utilum	2018-08-13	3	-17/+30
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Partly revert unused accessor	Ryuta Kamizono	2018-08-23	1	-8/+1
* \| \| \| \| \| \|	Merge pull request #33691 from tgxworld/add_config_to_disable_advisory_locks	Matthew Draper	2018-08-23	8	-4/+75
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Add database configuration to disable advisory locks.	Guo Xiang Tan	2018-08-22	8	-4/+75