diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-04-08 10:04:29 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-04-08 10:04:29 +0300 |
| commit | b4115ab5907ea3304a387357fcb10f4e0308b516 (patch) | |
| tree | b72e7c4c59eaa5a1e6f752e0aa314d5aee89b6be | |
| parent | 24d0899a0f6041966ee426cbf72e954fddecaafb (diff) | |
| parent | 8e9c033be2eb97895ccd5d050d09e8b5d65c35ee (diff) | |
Merge branch 'rugged-0.27' into 'master'
Use rugged 0.27.0
See merge request gitlab-org/gitaly!660
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 1 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4355f75a6..73352e340 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Gitaly changelog +UNRELEASED + +- Use rugged 0.27.0 + https://gitlab.com/gitlab-org/gitaly/merge_requests/660 + v0.94.0 - Send gitaly-ruby exceptions to their own DSN diff --git a/ruby/Gemfile b/ruby/Gemfile index dd3eff029..b300f2791 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -1,5 +1,6 @@ source 'https://rubygems.org' +gem 'rugged', '~> 0.27.0' gem 'github-linguist', '~> 5.3.3', require: 'linguist' gem 'gitlab-markup', '~> 1.6.2' gem 'gitaly-proto', '~> 0.95.0', require: 'gitaly' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 9146c4551..2687952c8 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -120,7 +120,7 @@ GEM rubocop-rspec (1.17.0) rubocop (>= 0.50.0) ruby-progressbar (1.8.3) - rugged (0.26.0) + rugged (0.27.0) sanitize (2.1.0) nokogiri (>= 1.4.4) sentry-raven (2.7.2) @@ -152,6 +152,7 @@ DEPENDENCIES licensee (~> 8.7.0) rdoc (~> 4.2) rspec + rugged (~> 0.27.0) sentry-raven (~> 2.7.2) BUNDLED WITH |