summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-04-04 19:02:59 -0700
committerStan Hu <stanhu@gmail.com>2019-04-04 19:02:59 -0700
commit9fe4120aeddb07eb9185e4234b9bbd5a77735bec (patch)
tree34ad425a3653d26fc66470e87040883a9a6e2c4c /Gemfile.lock
parentb704fce1bcd1d60b30524a832d0211c0d40e72ec (diff)
downloadgitlab-ce-9fe4120aeddb07eb9185e4234b9bbd5a77735bec.tar.gz
Upgrade globalid and i8n gems to match Rails 5.0.7.2sh-update-rails-5.0.7.2
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 12c23dd39df..8da1c7a3239 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -298,7 +298,7 @@ GEM
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
- globalid (0.4.1)
+ globalid (0.4.2)
activesupport (>= 4.2.0)
gon (6.2.0)
actionpack (>= 3.0)
@@ -385,7 +385,7 @@ GEM
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
- i18n (1.2.0)
+ i18n (1.6.0)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
ice_nine (0.11.2)