summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2018-11-20 18:53:41 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2018-11-20 18:53:41 +0000
commit233af8f1731734aaad7e5055af39f26c16608649 (patch)
tree3e1a5cf43ee8225d176edd4cd69ebae21a3d7a43
parente6c18efc22f421715a2cbce98b68a8ca2c984e57 (diff)
parent5b42ebbf24272fe07775d60f7af680a5e7de96e7 (diff)
downloadgitlab-ce-52276-jump-to-top-in-merge-request-2.tar.gz
Merge branch 'sh-bump-escape-utils' into 'master'52276-jump-to-top-in-merge-request-2
Upgrade escape_utils to 1.2.1 See merge request gitlab-org/gitlab-ce!23248
-rw-r--r--Gemfile.lock2
-rw-r--r--Gemfile.rails4.lock2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 380f1dbc89f..5ceb5d29252 100644
--- 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)
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock
index ead404c5f27..dd2cd59daae 100644
--- 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)