Merge branch 'ce-to-ee-2018-11-20' into 'master'

CE upstream - 2018-11-20 19:00 UTC See merge request gitlab-org/gitlab-ee!8539

Merge branch 'ce-to-ee-2018-11-20' into 'master'
CE upstream - 2018-11-20 19:00 UTC See merge request gitlab-org/gitlab-ee!8539
420159e5 · Stan Hu · 45c53ba5 · c58b02bd · 420159e5 · 420159e5
Commit 420159e5 authored Nov 20, 2018 by Stan Hu
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)