Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-20

c58b02bd · GitLab Bot · 45c53ba5 · 233af8f1 · c58b02bd · c58b02bd
Commit c58b02bd authored Nov 20, 2018 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +1 -1

Gemfile.rails4.lock Gemfile.rails4.lock +1 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -203,7 +203,7 @@ GEM
    encryptor (3.0.0)
    equalizer (0.0.11)
    erubis (2.7.0)
-    escape_utils (1.1.1)
+    escape_utils (1.2.1)
    et-orbi (1.0.3)
      tzinfo
    eventmachine (1.2.7)

--- a/Gemfile.rails4.lock
+++ b/Gemfile.rails4.lock
@@ -202,7 +202,7 @@ GEM
    encryptor (3.0.0)
    equalizer (0.0.11)
    erubis (2.7.0)
-    escape_utils (1.1.1)
+    escape_utils (1.2.1)
    et-orbi (1.0.3)
      tzinfo
    eventmachine (1.2.7)