diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-11-20 02:29:15 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-11-20 02:29:15 +0300 |
| commit | 8a581d531baf518c890d0e345d14fbe86a37de75 (patch) | |
| tree | e2c24b5fbf71744b3c5e8d150d853535616abe9e /Gemfile.rails4.lock | |
| parent | 2ef44dae2acea60709320d8b3dcd409a77d8f705 (diff) | |
| parent | eded08152273cf3eacac1002d41463d97de2e8de (diff) | |
Merge branch 'sh-bump-gems-security' into 'master'
Bump nokogiri, loofah, and rack gems for security updates
See merge request gitlab-org/gitlab-ce!23204
Diffstat (limited to 'Gemfile.rails4.lock')
| -rw-r--r-- | Gemfile.rails4.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index 384e90af844..ead404c5f27 100644 --- a/Gemfile.rails4.lock +++ b/Gemfile.rails4.lock @@ -125,9 +125,9 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.0.5) - concurrent-ruby-ext (1.0.5) - concurrent-ruby (= 1.0.5) + concurrent-ruby (1.1.3) + concurrent-ruby-ext (1.1.3) + concurrent-ruby (= 1.1.3) connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) @@ -441,7 +441,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.2.2) + loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -471,7 +471,7 @@ GEM net-ldap (0.16.0) net-ssh (5.0.1) netrc (0.11.0) - nokogiri (1.8.4) + nokogiri (1.8.5) mini_portile2 (~> 2.3.0) nokogumbo (1.5.0) nokogiri @@ -958,7 +958,7 @@ DEPENDENCIES chronic (~> 0.10.2) chronic_duration (~> 0.10.6) commonmarker (~> 0.17) - concurrent-ruby (~> 1.0.5) + concurrent-ruby (~> 1.1) connection_pool (~> 2.0) creole (~> 0.5.0) database_cleaner (~> 1.5.0) |