From f3e0ec7b4a2aee41a097bf8385f34e1a16c64713 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Mon, 12 Aug 2019 15:50:30 +0000
Subject: Update Gitaly server and gem to 1.58.0

---
 GITALY_SERVER_VERSION                              |  2 +-
 Gemfile                                            |  4 ++--
 Gemfile.lock                                       |  4 ++--
 lib/gitlab/gitaly_client/notification_service.rb   | 22 ----------------------
 .../gitaly_client/notification_service_spec.rb     | 17 -----------------
 5 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 lib/gitlab/gitaly_client/notification_service.rb
 delete mode 100644 spec/lib/gitlab/gitaly_client/notification_service_spec.rb

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 373aea97570..f269cd1b8b6 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.57.0
+1.58.0
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index dae06262a91..55143693d5c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -424,8 +424,8 @@ group :ed25519 do
   gem 'bcrypt_pbkdf', '~> 1.0'
 end
 
-# Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly'
+# Gitaly GRPC protocol definitions
+gem 'gitaly', '~> 1.58.0'
 
 gem 'grpc', '~> 1.19.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 3177951c9d6..6aa96d54abb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -309,7 +309,7 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gitaly-proto (1.37.0)
+    gitaly (1.58.0)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab-labkit (0.4.2)
@@ -1096,7 +1096,7 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 1.37.0)
+  gitaly (~> 1.58.0)
   github-markup (~> 1.7.0)
   gitlab-labkit (~> 0.4.2)
   gitlab-markup (~> 1.7.0)
diff --git a/lib/gitlab/gitaly_client/notification_service.rb b/lib/gitlab/gitaly_client/notification_service.rb
deleted file mode 100644
index 873c3e4086d..00000000000
--- a/lib/gitlab/gitaly_client/notification_service.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module GitalyClient
-    class NotificationService
-      # 'repository' is a Gitlab::Git::Repository
-      def initialize(repository)
-        @gitaly_repo = repository.gitaly_repository
-        @storage = repository.storage
-      end
-
-      def post_receive
-        GitalyClient.call(
-          @storage,
-          :notification_service,
-          :post_receive,
-          Gitaly::PostReceiveRequest.new(repository: @gitaly_repo)
-        )
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/gitaly_client/notification_service_spec.rb b/spec/lib/gitlab/gitaly_client/notification_service_spec.rb
deleted file mode 100644
index ffc3a09be30..00000000000
--- a/spec/lib/gitlab/gitaly_client/notification_service_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::GitalyClient::NotificationService do
-  describe '#post_receive' do
-    let(:project) { create(:project) }
-    let(:storage_name) { project.repository_storage }
-    let(:relative_path) { project.disk_path + '.git' }
-    subject { described_class.new(project.repository) }
-
-    it 'sends a post_receive message' do
-      expect_any_instance_of(Gitaly::NotificationService::Stub)
-        .to receive(:post_receive).with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
-
-      subject.post_receive
-    end
-  end
-end
-- 
cgit v1.2.1