diff options
| author | Patrick Bajao <ebajao@gitlab.com> | 2019-03-01 04:16:42 +0300 |
|---|---|---|
| committer | Patrick Bajao <ebajao@gitlab.com> | 2019-03-01 04:16:42 +0300 |
| commit | d097a65188de806dc8af27537f8c943f2a1ed36a (patch) | |
| tree | 3561ead7d856ce63a5df45a91a02ec9f82e95840 | |
| parent | b094de2e0dc3ee80fe13a64aed8067d79ef3e24c (diff) | |
Update gitaly-proto to 1.13.0 as well
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index d76eacb6b..8a8ce5771 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -6,7 +6,7 @@ gem 'bundler', '>= 1.16.5' gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.6.5' -gem 'gitaly-proto', git: 'https://gitlab.com/gitlab-org/gitaly-proto', branch: '45035-force-commit' +gem 'gitaly-proto', '~> 1.13.0' gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' gem 'gitlab-gollum-lib', '~> 4.2', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 9d4d7f707..4deb64c4c 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -1,11 +1,3 @@ -GIT - remote: https://gitlab.com/gitlab-org/gitaly-proto - revision: 496f2f5d797f48415d1583eafaa9d52a0b2f9763 - branch: 45035-force-commit - specs: - gitaly-proto (1.12.0) - grpc (~> 1.0) - GEM remote: https://rubygems.org/ specs: @@ -44,6 +36,8 @@ GEM ffi (1.10.0) gemojione (3.3.0) json + gitaly-proto (1.13.0) + grpc (~> 1.0) github-linguist (6.2.0) charlock_holmes (~> 0.7.6) escape_utils (~> 1.2.0) @@ -188,7 +182,7 @@ DEPENDENCIES bundler (>= 1.16.5) factory_bot faraday (~> 0.12) - gitaly-proto! + gitaly-proto (~> 1.13.0) github-linguist (~> 6.1) gitlab-gollum-lib (~> 4.2) gitlab-gollum-rugged_adapter (~> 0.4.4) |