summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-11-19 12:20:44 -0800
committerStan Hu <stanhu@gmail.com>2018-11-19 12:53:43 -0800
commit3af1fbfa842864e10cb840348826dcd22b9da806 (patch)
tree3d2c83f7e44d8ffd3ed659de3dd07714f17fda94 /Gemfile
parente20ceb56dea2b48c3b419d99417be367abe38742 (diff)
downloadgitlab-ce-sh-bump-gems-security.tar.gz
Bump nokogiri, loofah, and rack gems for security updatessh-bump-gems-security
loofah: CVE-2018-16468: https://github.com/flavorjones/loofah/issues/154 nokogiri: CVE-2018-14404 and CVE-2018-14567 https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md rack: CVE-2018-16471 https://github.com/rack/rack/commit/e5d58031b766e49687157b45edab1b8457d972bd i18n: https://github.com/svenfuchs/i18n/releases concurrent-ruby: https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 2a228b326ad..a0971d8f495 100644
--- a/Gemfile
+++ b/Gemfile
@@ -383,7 +383,7 @@ group :test do
gem 'rails-controller-testing' if rails5? # Rails5 only gem.
gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
gem 'sham_rack', '~> 1.3.6'
- gem 'concurrent-ruby', '~> 1.0.5'
+ gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.2.5'
gem 'rspec_junit_formatter'
end