diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2018-08-14 16:17:00 +0300 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-08-14 16:17:00 +0300 |
commit | 36d9819d06b7151ef67d50daa7ea78f1b8166b95 (patch) | |
tree | 2f588fbae90fb0d2833f81c13b249b35b873cb8e | |
parent | 88cfc76a6b7ed1c597e26255443950f43a2a6a4c (diff) | |
parent | 482112a046ae73572bb642267b0479f51318ed05 (diff) |
Merge branch 'sh-bump-rugged-0.27.4' into 'master'
Bump rugged to 0.27.4 for security fixes
See merge request gitlab-org/gitaly!856
-rw-r--r-- | changelogs/unreleased/sh-bump-rugged-0-27-4.yml | 5 | ||||
-rw-r--r-- | ruby/Gemfile | 2 | ||||
-rw-r--r-- | ruby/Gemfile.lock | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/changelogs/unreleased/sh-bump-rugged-0-27-4.yml b/changelogs/unreleased/sh-bump-rugged-0-27-4.yml new file mode 100644 index 000000000..e541bfd04 --- /dev/null +++ b/changelogs/unreleased/sh-bump-rugged-0-27-4.yml @@ -0,0 +1,5 @@ +--- +title: Bump rugged to 0.27.4 for security fixes +merge_request: 856 +author: +type: security diff --git a/ruby/Gemfile b/ruby/Gemfile index 59d15f0ef..ad3a4c171 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rugged', '~> 0.27.2' +gem 'rugged', '~> 0.27.4' gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.6.4' gem 'gitaly-proto', '~> 0.107.0', require: 'gitaly' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 8c6114981..7ee0c4548 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -123,7 +123,7 @@ GEM rubocop-rspec (1.17.0) rubocop (>= 0.50.0) ruby-progressbar (1.8.3) - rugged (0.27.2) + rugged (0.27.4) sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) @@ -158,8 +158,8 @@ DEPENDENCIES licensee (~> 8.9.0) rdoc (~> 4.2) rspec - rugged (~> 0.27.2) + rugged (~> 0.27.4) sentry-raven (~> 2.7.2) BUNDLED WITH - 1.16.2 + 1.16.3 |