Merge branch 'sh-bump-escape-utils' into 'master'

Upgrade escape_utils to 1.2.1 See merge request gitlab-org/gitlab-ce!23248

Merge branch 'sh-bump-escape-utils' into 'master'
Upgrade escape_utils to 1.2.1 See merge request gitlab-org/gitlab-ce!23248
233af8f1 · Douglas Barbosa Alexandre · e6c18efc · 5b42ebbf · 233af8f1 · 233af8f1
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

Gemfile.lock Gemfile.lock +1 -1

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

未找到文件。
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,7 +182,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
@@ -181,7 +181,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)