Merging upstream version 2.20.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 2 insertions, 4 deletions

diff --git a/pre_commit/languages/helpers.py b/pre_commit/languages/helpers.py
index 05a7165..0be08b5 100644
--- a/pre_commit/languages/helpers.py
+++ b/pre_commit/languages/helpers.py
@@ -5,9 +5,9 @@ import os
 import random
 import re
 from typing import Any
+from typing import NoReturn
 from typing import overload
 from typing import Sequence
-from typing import TYPE_CHECKING
 
 import pre_commit.constants as C
 from pre_commit import parse_shebang
@@ -16,9 +16,6 @@ from pre_commit.prefix import Prefix
 from pre_commit.util import cmd_output_b
 from pre_commit.xargs import xargs
 
-if TYPE_CHECKING:
-    from typing import NoReturn
-
 FIXED_RANDOM_SEED = 1542676187
 
 SHIMS_RE = re.compile(r'[/\\]shims[/\\]')
diff --git a/pre_commit/languages/ruby.py b/pre_commit/languages/ruby.py
index 6c5cff2..8955dd0 100644
--- a/pre_commit/languages/ruby.py
+++ b/pre_commit/languages/ruby.py
@@ -138,6 +138,7 @@ def install_environment(
                 (
                     'gem', 'install',
                     '--no-document', '--no-format-executable',
+                    '--no-user-install',
                     *prefix.star('.gem'), *additional_dependencies,
                 ),
             )