Automatically lint proto files

38 files changed, 227 insertions, 191 deletions

diff --git a/proto/blob.proto b/proto/blob.proto
index 4d6653bc4..528615f73 100644
--- a/proto/blob.proto
+++ b/proto/blob.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "lint.proto";
 import "shared.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 service BlobService {
   // GetBlob returns the contents of a blob object referenced by its object
   // ID. We use a stream to return a chunked arbitrarily large binary
diff --git a/proto/cleanup.proto b/proto/cleanup.proto
index bcce016e5..07e8ad72f 100644
--- a/proto/cleanup.proto
+++ b/proto/cleanup.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "lint.proto";
 import "shared.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 service CleanupService {
   rpc ApplyBfgObjectMapStream(stream ApplyBfgObjectMapStreamRequest) returns (stream ApplyBfgObjectMapStreamResponse) {
     option (op_type) = {
@@ -26,13 +26,13 @@ message ApplyBfgObjectMapStreamRequest {
 }
 
 message ApplyBfgObjectMapStreamResponse {
-	// We send back each parsed entry in the request's object map so the client
-	// can take action
-	message Entry {
-		ObjectType type = 1;
-		string old_oid = 2;
-		string new_oid = 3;
-	}
-
-	repeated Entry entries = 1;
+  // We send back each parsed entry in the request's object map so the client
+  // can take action
+  message Entry {
+    ObjectType type = 1;
+    string old_oid = 2;
+    string new_oid = 3;
+  }
+
+  repeated Entry entries = 1;
 }
diff --git a/proto/commit.proto b/proto/commit.proto
index 405d54f5a..2311ac78d 100644
--- a/proto/commit.proto
+++ b/proto/commit.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
+import "google/protobuf/timestamp.proto";
 import "lint.proto";
 import "shared.proto";
-import "google/protobuf/timestamp.proto";
+
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
 
 service CommitService {
 
@@ -382,7 +382,7 @@ message FindCommitResponse {
 
 message ListCommitsByOidRequest {
   Repository repository = 1 [(target_repository)=true];
-  repeated string oid = 2;
+  repeated string oid = 2; // protolint:disable:this REPEATED_FIELD_NAMES_PLURALIZED
 }
 
 message ListCommitsByOidResponse {
diff --git a/proto/conflicts.proto b/proto/conflicts.proto
index b8eedb8a1..bad601963 100644
--- a/proto/conflicts.proto
+++ b/proto/conflicts.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
+import "google/protobuf/timestamp.proto";
 import "lint.proto";
 import "shared.proto";
-import "google/protobuf/timestamp.proto";
+
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
 
 service ConflictsService {
   rpc ListConflictFiles(ListConflictFilesRequest) returns (stream ListConflictFilesResponse) {
diff --git a/proto/diff.proto b/proto/diff.proto
index cb6941db0..536cc675f 100644
--- a/proto/diff.proto
+++ b/proto/diff.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "lint.proto";
 import "shared.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 service DiffService {
   // Returns stream of CommitDiffResponse with patches chunked over messages
   rpc CommitDiff(CommitDiffRequest) returns (stream CommitDiffResponse) {
diff --git a/proto/errors.proto b/proto/errors.proto
index 101c58bf7..335c78ace 100644
--- a/proto/errors.proto
+++ b/proto/errors.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "google/protobuf/duration.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 // AccessCheckError is an error returned by GitLab's `/internal/allowed`
 // endpoint.
 message AccessCheckError {
@@ -48,9 +48,9 @@ message ResolveRevisionError {
 
 // LimitError is an error returned when Gitaly enforces request limits.
 message LimitError {
-	// ErrorMessage provides context into why a limit was enforced.
-	string error_message = 1;
-	// RetryAfter provides the duration after which a retry is safe.
-	// 0 indicates non-retryable.
-	google.protobuf.Duration retry_after = 2;
+  // ErrorMessage provides context into why a limit was enforced.
+  string error_message = 1;
+  // RetryAfter provides the duration after which a retry is safe.
+  // 0 indicates non-retryable.
+  google.protobuf.Duration retry_after = 2;
 }
diff --git a/proto/go/gitalypb/commit.pb.go b/proto/go/gitalypb/commit.pb.go
index 4dd23e043..09d6de63f 100644
--- a/proto/go/gitalypb/commit.pb.go
+++ b/proto/go/gitalypb/commit.pb.go
@@ -1778,7 +1778,7 @@ type ListCommitsByOidRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
-	Oid        []string    `protobuf:"bytes,2,rep,name=oid,proto3" json:"oid,omitempty"`
+	Oid        []string    `protobuf:"bytes,2,rep,name=oid,proto3" json:"oid,omitempty"` // protolint:disable:this REPEATED_FIELD_NAMES_PLURALIZED
 }
 
 func (x *ListCommitsByOidRequest) Reset() {
@@ -3756,10 +3756,10 @@ var File_commit_proto protoreflect.FileDescriptor
 
 var file_commit_proto_rawDesc = []byte{
 	0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06,
-	0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x1a, 0x0a, 0x6c, 0x69, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
+	0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x6c, 0x69, 0x6e, 0x74, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x1a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x22, 0x94, 0x04, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74,
 	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0a, 0x72, 0x65, 0x70, 0x6f,
 	0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67,
diff --git a/proto/go/gitalypb/conflicts.pb.go b/proto/go/gitalypb/conflicts.pb.go
index ece9943b5..67fa740cf 100644
--- a/proto/go/gitalypb/conflicts.pb.go
+++ b/proto/go/gitalypb/conflicts.pb.go
@@ -574,10 +574,10 @@ var File_conflicts_proto protoreflect.FileDescriptor
 
 var file_conflicts_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x06, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x1a, 0x0a, 0x6c, 0x69, 0x6e, 0x74, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70,
+	0x6f, 0x12, 0x06, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73,
+	0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x6c, 0x69, 0x6e, 0x74,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd6, 0x01, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e,
 	0x66, 0x6c, 0x69, 0x63, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x12, 0x38, 0x0a, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18,
diff --git a/proto/go/gitalypb/internal.pb.go b/proto/go/gitalypb/internal.pb.go
index d7b604b54..041fb48f1 100644
--- a/proto/go/gitalypb/internal.pb.go
+++ b/proto/go/gitalypb/internal.pb.go
@@ -130,9 +130,9 @@ var File_internal_proto protoreflect.FileDescriptor
 
 var file_internal_proto_rawDesc = []byte{
 	0x0a, 0x0e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x12, 0x06, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x1a, 0x0a, 0x6c, 0x69, 0x6e, 0x74, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e,
+	0x12, 0x06, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
+	0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x6c, 0x69, 0x6e, 0x74, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3b, 0x0a, 0x10, 0x57, 0x61, 0x6c, 0x6b, 0x52, 0x65, 0x70,
 	0x6f, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0c, 0x73, 0x74, 0x6f,
 	0x72, 0x61, 0x67, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
diff --git a/proto/go/gitalypb/operations.pb.go b/proto/go/gitalypb/operations.pb.go
index 5914d5aaf..dfa0d8dd7 100644
--- a/proto/go/gitalypb/operations.pb.go
+++ b/proto/go/gitalypb/operations.pb.go
@@ -3455,11 +3455,11 @@ var File_operations_proto protoreflect.FileDescriptor
 
 var file_operations_proto_rawDesc = []byte{
 	0x0a, 0x10, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x12, 0x06, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x1a, 0x0a, 0x6c, 0x69, 0x6e, 0x74,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0c, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72,
+	0x74, 0x6f, 0x12, 0x06, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x1a, 0x0c, 0x65, 0x72, 0x72, 0x6f,
+	0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
+	0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x6c, 0x69, 0x6e, 0x74, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x22, 0xb7, 0x01, 0x0a, 0x17, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61,
 	0x74, 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
 	0x38, 0x0a, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20,
@@ -4261,9 +4261,9 @@ func file_operations_proto_init() {
 	if File_operations_proto != nil {
 		return
 	}
+	file_errors_proto_init()
 	file_lint_proto_init()
 	file_shared_proto_init()
-	file_errors_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_operations_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserCreateBranchRequest); i {
diff --git a/proto/go/gitalypb/praefect.pb.go b/proto/go/gitalypb/praefect.pb.go
index e21485b62..dc5cab186 100644
--- a/proto/go/gitalypb/praefect.pb.go
+++ b/proto/go/gitalypb/praefect.pb.go
@@ -1208,10 +1208,10 @@ var File_praefect_proto protoreflect.FileDescriptor
 
 var file_praefect_proto_rawDesc = []byte{
 	0x0a, 0x0e, 0x70, 0x72, 0x61, 0x65, 0x66, 0x65, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x12, 0x06, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x1a, 0x0a, 0x6c, 0x69, 0x6e, 0x74, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72,
+	0x12, 0x06, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
+	0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x6c, 0x69, 0x6e, 0x74, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x22, 0x86, 0x02, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x6b, 0x55, 0x6e, 0x76, 0x65,
 	0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x25, 0x0a,
 	0x0d, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x01,
diff --git a/proto/go/gitalypb/ref.pb.go b/proto/go/gitalypb/ref.pb.go
index 116e1ac18..8b2ad1fe1 100644
--- a/proto/go/gitalypb/ref.pb.go
+++ b/proto/go/gitalypb/ref.pb.go
@@ -1531,7 +1531,7 @@ type DeleteRefsRequest struct {
 
 	Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
 	// The following two fields are mutually exclusive
-	ExceptWithPrefix [][]byte `protobuf:"bytes,2,rep,name=except_with_prefix,json=exceptWithPrefix,proto3" json:"except_with_prefix,omitempty"`
+	ExceptWithPrefix [][]byte `protobuf:"bytes,2,rep,name=except_with_prefix,json=exceptWithPrefix,proto3" json:"except_with_prefix,omitempty"` // protolint:disable:this REPEATED_FIELD_NAMES_PLURALIZED
 	Refs             [][]byte `protobuf:"bytes,3,rep,name=refs,proto3" json:"refs,omitempty"`
 }
 
@@ -2831,10 +2831,10 @@ var File_ref_proto protoreflect.FileDescriptor
 
 var file_ref_proto_rawDesc = []byte{
 	0x0a, 0x09, 0x72, 0x65, 0x66, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x67, 0x69, 0x74,
-	0x61, 0x6c, 0x79, 0x1a, 0x0a, 0x6c, 0x69, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x0c, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74,
-	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x58,
+	0x61, 0x6c, 0x79, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x6c, 0x69, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x1a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x58,
 	0x0a, 0x1c, 0x46, 0x69, 0x6e, 0x64, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x42, 0x72, 0x61,
 	0x6e, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38,
 	0x0a, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01,
diff --git a/proto/go/gitalypb/remote.pb.go b/proto/go/gitalypb/remote.pb.go
index 4bdee73c7..0ddfda907 100644
--- a/proto/go/gitalypb/remote.pb.go
+++ b/proto/go/gitalypb/remote.pb.go
@@ -37,7 +37,7 @@ type UpdateRemoteMirrorRequest struct {
 	// branch name without the 'refs/heads/' prefix. "*" can be used as a
 	// wildcard to match anything. only_branches_matching can be streamed to the
 	// server over multiple messages. Optional.
-	OnlyBranchesMatching [][]byte `protobuf:"bytes,3,rep,name=only_branches_matching,json=onlyBranchesMatching,proto3" json:"only_branches_matching,omitempty"`
+	OnlyBranchesMatching [][]byte `protobuf:"bytes,3,rep,name=only_branches_matching,json=onlyBranchesMatching,proto3" json:"only_branches_matching,omitempty"` // protolint:disable:this REPEATED_FIELD_NAMES_PLURALIZED
 	// SshKey is the SSH key to use for accessing to the mirror repository.
 	// Optional.
 	SshKey string `protobuf:"bytes,4,opt,name=ssh_key,json=sshKey,proto3" json:"ssh_key,omitempty"`
diff --git a/proto/go/gitalypb/repository-service.pb.go b/proto/go/gitalypb/repository-service.pb.go
index 54e49033c..06c469ec2 100644
--- a/proto/go/gitalypb/repository-service.pb.go
+++ b/proto/go/gitalypb/repository-service.pb.go
@@ -26,7 +26,7 @@ const (
 	// SizeMultiple requires to use '--split --size-multiple=4' strategy to create/update commit graph.
 	// https://git-scm.com/docs/git-commit-graph#Documentation/git-commit-graph.txt-emwriteem
 	// It is a default, there is no need to explicitly set it in the request.
-	WriteCommitGraphRequest_SizeMultiple WriteCommitGraphRequest_SplitStrategy = 0
+	WriteCommitGraphRequest_SizeMultiple WriteCommitGraphRequest_SplitStrategy = 0 // protolint:disable:this ENUM_FIELD_NAMES_UPPER_SNAKE_CASE
 )
 
 // Enum value maps for WriteCommitGraphRequest_SplitStrategy.
@@ -649,7 +649,7 @@ type WriteCommitGraphRequest struct {
 
 	Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
 	// SplitStrategy is a strategy used to create/update commit graph.
-	SplitStrategy WriteCommitGraphRequest_SplitStrategy `protobuf:"varint,2,opt,name=splitStrategy,proto3,enum=gitaly.WriteCommitGraphRequest_SplitStrategy" json:"splitStrategy,omitempty"`
+	SplitStrategy WriteCommitGraphRequest_SplitStrategy `protobuf:"varint,2,opt,name=splitStrategy,proto3,enum=gitaly.WriteCommitGraphRequest_SplitStrategy" json:"splitStrategy,omitempty"` // protolint:disable:this FIELD_NAMES_LOWER_SNAKE_CASE
 }
 
 func (x *WriteCommitGraphRequest) Reset() {
@@ -1391,7 +1391,7 @@ type GetArchiveRequest struct {
 	Prefix     string                   `protobuf:"bytes,3,opt,name=prefix,proto3" json:"prefix,omitempty"`
 	Format     GetArchiveRequest_Format `protobuf:"varint,4,opt,name=format,proto3,enum=gitaly.GetArchiveRequest_Format" json:"format,omitempty"`
 	Path       []byte                   `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"`
-	Exclude    [][]byte                 `protobuf:"bytes,6,rep,name=exclude,proto3" json:"exclude,omitempty"`
+	Exclude    [][]byte                 `protobuf:"bytes,6,rep,name=exclude,proto3" json:"exclude,omitempty"` // protolint:disable:this REPEATED_FIELD_NAMES_PLURALIZED
 	// If `elide_path` is true and `path` refers to a subdirectory, that
 	// subdirectory will be elided from archive entries. For example, if `dir`
 	// contains `README.md`, with `elide_path = false` the corresponding entry
diff --git a/proto/go/internal/linter/testdata/invalid.proto b/proto/go/internal/linter/testdata/invalid.proto
index badafa4da..db8b14bf7 100644
--- a/proto/go/internal/linter/testdata/invalid.proto
+++ b/proto/go/internal/linter/testdata/invalid.proto
@@ -2,12 +2,13 @@ syntax = "proto3";
 
 package test;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/internal/linter/testdata";
-
 import "lint.proto";
 import "shared.proto";
 
-message InvalidMethodRequest {}
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/internal/linter/testdata";
+
+message InvalidMethodRequest {
+}
 
 message InvalidMethodRequestWithRepo {
   gitaly.Repository destination = 1 [(gitaly.target_repository)=true];
@@ -17,7 +18,8 @@ message InvalidTargetType {
   int32 wrong_type = 1 [(gitaly.target_repository)=true];
 }
 
-message InvalidMethodResponse{}
+message InvalidMethodResponse{
+}
 
 message InvalidNestedRequest{
   InvalidTargetType inner_message = 1;
@@ -159,8 +161,8 @@ service InvalidService {
 
   // Intercepted methods must not have operation type annotations.
   rpc InvalidMethod15(RequestWithStorageAndRepo) returns (InvalidMethodResponse) {
-      option (gitaly.intercepted_method) = true;
-      option (gitaly.op_type) = {};
+    option (gitaly.intercepted_method) = true;
+    option (gitaly.op_type) = {};
   };
 
   rpc MaintenanceWithMissingRepository(InvalidMethodRequest) returns (InvalidMethodResponse) {
diff --git a/proto/go/internal/linter/testdata/valid.proto b/proto/go/internal/linter/testdata/valid.proto
index 9d1c9532e..b7821c0a3 100644
--- a/proto/go/internal/linter/testdata/valid.proto
+++ b/proto/go/internal/linter/testdata/valid.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package test;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/internal/linter/testdata";
-
 import "lint.proto";
 import "shared.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/internal/linter/testdata";
+
 message ValidRequest {
   gitaly.Repository destination = 1 [(gitaly.target_repository)=true];
 }
@@ -18,7 +18,8 @@ message ValidStorageRequest {
   string storage_name = 1 [(gitaly.storage)=true];
 }
 
-message ValidResponse{}
+message ValidResponse{
+}
 
 message ValidNestedRequest{
   ValidRequest inner_message = 1;
diff --git a/proto/hook.proto b/proto/hook.proto
index 9c3810ded..e7aa89ec0 100644
--- a/proto/hook.proto
+++ b/proto/hook.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "lint.proto";
 import "shared.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 service HookService {
   rpc PreReceiveHook(stream PreReceiveHookRequest) returns (stream PreReceiveHookResponse) {
     option (op_type) = {
@@ -123,4 +123,5 @@ message PackObjectsHookWithSidechannelRequest {
   repeated string args = 2;
 }
 
-message PackObjectsHookWithSidechannelResponse {}
+message PackObjectsHookWithSidechannelResponse {
+}
diff --git a/proto/internal.proto b/proto/internal.proto
index 1cacb3bc5..ce45f9476 100644
--- a/proto/internal.proto
+++ b/proto/internal.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
-import "lint.proto";
 import "google/protobuf/timestamp.proto";
+import "lint.proto";
+
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
 
 // InternalGitaly is a gRPC service meant to be served by a Gitaly node, but
 // only reachable by Praefect or other Gitalies
diff --git a/proto/lint.proto b/proto/lint.proto
index e656e1710..7ba28288a 100644
--- a/proto/lint.proto
+++ b/proto/lint.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "google/protobuf/descriptor.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 message OperationMsg {
   enum Operation {
     UNKNOWN = 0;
diff --git a/proto/namespace.proto b/proto/namespace.proto
index 298ef9cb4..e81ef7224 100644
--- a/proto/namespace.proto
+++ b/proto/namespace.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "lint.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 service NamespaceService {
   rpc AddNamespace(AddNamespaceRequest) returns (AddNamespaceResponse) {
     option (op_type) = {
@@ -58,6 +58,9 @@ message NamespaceExistsResponse {
   bool exists = 1;
 }
 
-message AddNamespaceResponse {}
-message RemoveNamespaceResponse {}
-message RenameNamespaceResponse {}
+message AddNamespaceResponse {
+}
+message RemoveNamespaceResponse {
+}
+message RenameNamespaceResponse {
+}
diff --git a/proto/objectpool.proto b/proto/objectpool.proto
index e6be24c39..748370e31 100644
--- a/proto/objectpool.proto
+++ b/proto/objectpool.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "lint.proto";
 import "shared.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 service ObjectPoolService {
   rpc CreateObjectPool(CreateObjectPoolRequest) returns (CreateObjectPoolResponse) {
     option (op_type) = {
@@ -54,38 +54,44 @@ message CreateObjectPoolRequest {
   ObjectPool object_pool = 1 [(target_repository)=true];
   Repository origin = 2 [(additional_repository)=true];
 }
-message CreateObjectPoolResponse {}
+message CreateObjectPoolResponse {
+}
 
 // Removes the directory from disk, caller is responsible for leaving the object
 // pool before calling this RPC
 message DeleteObjectPoolRequest {
   ObjectPool object_pool = 1 [(target_repository)=true];
 }
-message DeleteObjectPoolResponse {}
+message DeleteObjectPoolResponse {
+}
 
 message LinkRepositoryToObjectPoolRequest {
   ObjectPool object_pool = 1 [(additional_repository)=true];
   Repository repository = 2 [(target_repository)=true];
 }
-message LinkRepositoryToObjectPoolResponse {}
+message LinkRepositoryToObjectPoolResponse {
+}
 
 message ReduplicateRepositoryRequest {
   Repository repository = 1 [(target_repository)=true];
 }
-message ReduplicateRepositoryResponse {}
+message ReduplicateRepositoryResponse {
+}
 
 message DisconnectGitAlternatesRequest {
   Repository repository = 1  [(target_repository)=true];
 }
 
-message DisconnectGitAlternatesResponse {}
+message DisconnectGitAlternatesResponse {
+}
 
 message FetchIntoObjectPoolRequest {
   Repository origin = 1 [(additional_repository)=true];
   ObjectPool object_pool = 2 [(target_repository)=true];
   bool repack = 3;
 }
-message FetchIntoObjectPoolResponse {}
+message FetchIntoObjectPoolResponse {
+}
 
 message GetObjectPoolRequest {
   Repository repository = 1 [(target_repository)=true];
@@ -94,5 +100,3 @@ message GetObjectPoolRequest {
 message GetObjectPoolResponse {
   ObjectPool object_pool = 1;
 }
-
-
diff --git a/proto/operations.proto b/proto/operations.proto
index 7f0b95251..a7f240b0c 100644
--- a/proto/operations.proto
+++ b/proto/operations.proto
@@ -2,12 +2,12 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
-import "lint.proto";
-import "shared.proto";
 import "errors.proto";
 import "google/protobuf/timestamp.proto";
+import "lint.proto";
+import "shared.proto";
+
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
 
 // OperationService provides an interface for performing mutating git
 // operations on a repository on behalf of a user. The user's operation is
diff --git a/proto/praefect.proto b/proto/praefect.proto
index 2e913b99f..dd3acb431 100644
--- a/proto/praefect.proto
+++ b/proto/praefect.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
+import "google/protobuf/timestamp.proto";
 import "lint.proto";
 import "shared.proto";
-import "google/protobuf/timestamp.proto";
+
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
 
 service PraefectInfoService {
   option (intercepted) = true;
@@ -139,7 +139,8 @@ message SetAuthoritativeStorageRequest {
   string authoritative_storage = 3;
 }
 
-message SetAuthoritativeStorageResponse {}
+message SetAuthoritativeStorageResponse {
+}
 
 message DatalossCheckRequest {
   string virtual_storage = 1;
diff --git a/proto/ref.proto b/proto/ref.proto
index 72eb62c35..b3697b540 100644
--- a/proto/ref.proto
+++ b/proto/ref.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
+import "google/protobuf/timestamp.proto";
 import "lint.proto";
 import "shared.proto";
-import "google/protobuf/timestamp.proto";
+
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
 
 service RefService {
   rpc FindDefaultBranchName(FindDefaultBranchNameRequest) returns (FindDefaultBranchNameResponse) {
@@ -270,7 +270,8 @@ message DeleteBranchRequest {
 }
 
 // Not clear if we need to do status signaling; we can add fields later.
-message DeleteBranchResponse {}
+message DeleteBranchResponse {
+}
 
 message FindBranchRequest {
   // repository is the repository in which the branch should be looked up.
@@ -287,7 +288,7 @@ message FindBranchResponse {
 message DeleteRefsRequest{
   Repository repository = 1 [(target_repository)=true];
   // The following two fields are mutually exclusive
-  repeated bytes except_with_prefix = 2;
+  repeated bytes except_with_prefix = 2; // protolint:disable:this REPEATED_FIELD_NAMES_PLURALIZED
   repeated bytes refs = 3;
 }
 
@@ -388,7 +389,8 @@ message PackRefsRequest {
   reserved "all_refs";
 }
 
-message PackRefsResponse{}
+message PackRefsResponse{
+}
 
 // ListRefsRequest is a request for the ListRefs RPC.
 message ListRefsRequest {
diff --git a/proto/remote.proto b/proto/remote.proto
index acfa3fa98..869f96331 100644
--- a/proto/remote.proto
+++ b/proto/remote.proto
@@ -2,40 +2,40 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "lint.proto";
 import "shared.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 service RemoteService {
 
-    // UpdateRemoteMirror compares the references in the target repository and its remote mirror
-    // repository. Any differences in the references are then addressed by pushing the differing
-    // references to the mirror. Created and modified references are updated, removed references are
-    // deleted from the mirror. UpdateRemoteMirror updates all tags. Branches are updated if they match
-    // the patterns specified in the requests.
-    rpc UpdateRemoteMirror(stream UpdateRemoteMirrorRequest) returns (UpdateRemoteMirrorResponse) {
-      option (op_type) = {
+  // UpdateRemoteMirror compares the references in the target repository and its remote mirror
+  // repository. Any differences in the references are then addressed by pushing the differing
+  // references to the mirror. Created and modified references are updated, removed references are
+  // deleted from the mirror. UpdateRemoteMirror updates all tags. Branches are updated if they match
+  // the patterns specified in the requests.
+  rpc UpdateRemoteMirror(stream UpdateRemoteMirrorRequest) returns (UpdateRemoteMirrorResponse) {
+    option (op_type) = {
         op: ACCESSOR
       };
-    }
-    rpc FindRemoteRepository(FindRemoteRepositoryRequest) returns (FindRemoteRepositoryResponse) {
-      option (op_type) = {
+  }
+  rpc FindRemoteRepository(FindRemoteRepositoryRequest) returns (FindRemoteRepositoryResponse) {
+    option (op_type) = {
         op: ACCESSOR
         scope_level: STORAGE
       };
-    }
+  }
 
-    // FindRemoteRootRef tries to find the root reference of a remote
-    // repository. The root reference is the default branch as pointed to by
-    // the remotes HEAD reference. Returns an InvalidArgument error if the
-    // specified remote does not exist and a NotFound error in case no HEAD
-    // branch was found.
-    rpc FindRemoteRootRef(FindRemoteRootRefRequest) returns (FindRemoteRootRefResponse) {
-      option (op_type) = {
+  // FindRemoteRootRef tries to find the root reference of a remote
+  // repository. The root reference is the default branch as pointed to by
+  // the remotes HEAD reference. Returns an InvalidArgument error if the
+  // specified remote does not exist and a NotFound error in case no HEAD
+  // branch was found.
+  rpc FindRemoteRootRef(FindRemoteRootRefRequest) returns (FindRemoteRootRefResponse) {
+    option (op_type) = {
         op: ACCESSOR
       };
-    }
+  }
 }
 
 message UpdateRemoteMirrorRequest {
@@ -63,7 +63,7 @@ message UpdateRemoteMirrorRequest {
   // branch name without the 'refs/heads/' prefix. "*" can be used as a
   // wildcard to match anything. only_branches_matching can be streamed to the
   // server over multiple messages. Optional.
-  repeated bytes only_branches_matching = 3;
+  repeated bytes only_branches_matching = 3; // protolint:disable:this REPEATED_FIELD_NAMES_PLURALIZED
   // SshKey is the SSH key to use for accessing to the mirror repository.
   // Optional.
   string ssh_key = 4;
diff --git a/proto/repository-service.proto b/proto/repository-service.proto
index 3fda65d1c..ad6c06f09 100644
--- a/proto/repository-service.proto
+++ b/proto/repository-service.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "lint.proto";
 import "shared.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 service RepositoryService {
   rpc RepositoryExists(RepositoryExistsRequest) returns (RepositoryExistsResponse) {
     option (op_type) = {
@@ -295,20 +295,23 @@ message RepackIncrementalRequest {
   Repository repository = 1 [(target_repository)=true];
 }
 
-message RepackIncrementalResponse {}
+message RepackIncrementalResponse {
+}
 
 message RepackFullRequest {
   Repository repository = 1 [(target_repository)=true];
   bool create_bitmap = 2;
 }
 
-message RepackFullResponse {}
+message RepackFullResponse {
+}
 
 message MidxRepackRequest {
   Repository repository = 1 [(target_repository)=true];
 }
 
-message MidxRepackResponse {}
+message MidxRepackResponse {
+}
 
 message GarbageCollectRequest {
   Repository repository = 1 [(target_repository)=true];
@@ -321,27 +324,30 @@ message GarbageCollectRequest {
   bool prune = 3;
 }
 
-message GarbageCollectResponse {}
+message GarbageCollectResponse {
+}
 
 message WriteCommitGraphRequest {
   enum SplitStrategy {
     // SizeMultiple requires to use '--split --size-multiple=4' strategy to create/update commit graph.
     // https://git-scm.com/docs/git-commit-graph#Documentation/git-commit-graph.txt-emwriteem
     // It is a default, there is no need to explicitly set it in the request.
-    SizeMultiple = 0;
+    SizeMultiple = 0; // protolint:disable:this ENUM_FIELD_NAMES_UPPER_SNAKE_CASE
   }
   Repository repository = 1 [(target_repository)=true];
   // SplitStrategy is a strategy used to create/update commit graph.
-  SplitStrategy splitStrategy = 2;
+  SplitStrategy splitStrategy = 2; // protolint:disable:this FIELD_NAMES_LOWER_SNAKE_CASE
 }
 
-message WriteCommitGraphResponse {}
+message WriteCommitGraphResponse {
+}
 
 message CleanupRequest {
   Repository repository = 1 [(target_repository)=true];
 }
 
-message CleanupResponse {}
+message CleanupResponse {
+}
 
 message RepositorySizeRequest {
   Repository repository = 1 [(target_repository)=true];
@@ -357,7 +363,8 @@ message ApplyGitattributesRequest {
   bytes revision = 2;
 }
 
-message ApplyGitattributesResponse {}
+message ApplyGitattributesResponse {
+}
 
 message FetchBundleRequest {
   // Repository into which the reference shall be fetched.
@@ -370,7 +377,8 @@ message FetchBundleRequest {
   bool update_head = 3;
 }
 
-message FetchBundleResponse {}
+message FetchBundleResponse {
+}
 
 message FetchRemoteRequest {
   Repository repository = 1 [(target_repository)=true];
@@ -414,7 +422,8 @@ message CreateRepositoryRequest {
   bytes default_branch = 2;
 }
 
-message CreateRepositoryResponse {}
+message CreateRepositoryResponse {
+}
 
 message GetArchiveRequest {
   enum Format {
@@ -429,7 +438,7 @@ message GetArchiveRequest {
   string prefix = 3;
   Format format = 4;
   bytes path = 5;
-  repeated bytes exclude = 6;
+  repeated bytes exclude = 6; // protolint:disable:this REPEATED_FIELD_NAMES_PLURALIZED
   // If `elide_path` is true and `path` refers to a subdirectory, that
   // subdirectory will be elided from archive entries. For example, if `dir`
   // contains `README.md`, with `elide_path = false` the corresponding entry
@@ -514,7 +523,8 @@ message CreateForkRequest {
   Repository source_repository = 2;
 }
 
-message CreateForkResponse {}
+message CreateForkResponse {
+}
 
 message CreateRepositoryFromURLRequest {
   Repository repository = 1 [(target_repository)=true];
@@ -534,7 +544,8 @@ message CreateRepositoryFromURLRequest {
   bool mirror = 5;
 }
 
-message CreateRepositoryFromURLResponse {}
+message CreateRepositoryFromURLResponse {
+}
 
 message CreateBundleRequest {
   Repository repository = 1 [(target_repository)=true];
@@ -576,7 +587,8 @@ message  RestoreCustomHooksRequest {
   bytes data = 2;
 }
 
-message RestoreCustomHooksResponse {}
+message RestoreCustomHooksResponse {
+}
 
 message BackupCustomHooksRequest {
   Repository repository = 1 [(target_repository)=true];
@@ -592,7 +604,8 @@ message CreateRepositoryFromBundleRequest {
   bytes data = 2;
 }
 
-message CreateRepositoryFromBundleResponse {}
+message CreateRepositoryFromBundleResponse {
+}
 
 message FindLicenseRequest {
   Repository repository = 1 [(target_repository)=true];
@@ -636,7 +649,8 @@ message CreateRepositoryFromSnapshotRequest {
   string http_host = 4;
 }
 
-message CreateRepositoryFromSnapshotResponse {}
+message CreateRepositoryFromSnapshotResponse {
+}
 
 message GetRawChangesRequest {
   Repository repository = 1 [(target_repository)=true];
@@ -770,13 +784,15 @@ message ReplicateRepositoryRequest {
   Repository source = 2;
 }
 
-message ReplicateRepositoryResponse{}
+message ReplicateRepositoryResponse{
+}
 
 message OptimizeRepositoryRequest {
   Repository repository = 1 [(target_repository)=true];
 }
 
-message OptimizeRepositoryResponse{}
+message OptimizeRepositoryResponse{
+}
 
 // PruneUnreachableObjectsRequest is a request for the PruneUnreachableObjects
 // RPC call.
@@ -798,4 +814,5 @@ message SetFullPathRequest {
 }
 
 // SetFullPathResponse is a response fqor the SetFullPath RPC.
-message SetFullPathResponse {}
+message SetFullPathResponse {
+}
diff --git a/proto/server.proto b/proto/server.proto
index 7a6140222..35be64925 100644
--- a/proto/server.proto
+++ b/proto/server.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "lint.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 service ServerService {
   option (intercepted) = true;
 
@@ -16,7 +16,8 @@ service ServerService {
   rpc ClockSynced(ClockSyncedRequest) returns (ClockSyncedResponse) {}
 }
 
-message ServerInfoRequest {}
+message ServerInfoRequest {
+}
 
 message ServerInfoResponse {
   message StorageStatus {
@@ -33,12 +34,13 @@ message ServerInfoResponse {
   repeated StorageStatus storage_statuses = 3;
 }
 
-message DiskStatisticsRequest {}
+message DiskStatisticsRequest {
+}
 
 message DiskStatisticsResponse {
   message StorageStatus {
-// When both available and used fields are equal 0 that means that
-// Gitaly was unable to determine storage stats.
+    // When both available and used fields are equal 0 that means that
+    // Gitaly was unable to determine storage stats.
     string storage_name = 1;
     int64 available = 2;
     int64 used = 3;
diff --git a/proto/shared.proto b/proto/shared.proto
index 07ca7c5d2..e5bb6a9f7 100644
--- a/proto/shared.proto
+++ b/proto/shared.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "google/protobuf/timestamp.proto";
 import "lint.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 enum ObjectType {
   UNKNOWN = 0;
   COMMIT = 1;
@@ -128,19 +128,19 @@ message ObjectPool {
 }
 
 message PaginationParameter {
-	// Instructs pagination to start sending results after the provided page
-	// token appears. A page token allows for a generic pattern to uniquely
-	// identify a result or 'page'. Each paginated RPC may interpret a page
-	// token differently.
-	string page_token = 1;
-	// When fully consuming the response the client will receive _at most_
-	// `limit` number of resulting objects. Note that the number of response
-	// messages might be much lower, as some response messages already send
-	// multiple objects per message.
-	// When the limit is smaller than 0, it will be normalized to 2147483647
-	// on the server side. When limit is not set, it defaults to 0, and no
-	// results are send in the response.
-	int32 limit = 2;
+  // Instructs pagination to start sending results after the provided page
+  // token appears. A page token allows for a generic pattern to uniquely
+  // identify a result or 'page'. Each paginated RPC may interpret a page
+  // token differently.
+  string page_token = 1;
+  // When fully consuming the response the client will receive _at most_
+  // `limit` number of resulting objects. Note that the number of response
+  // messages might be much lower, as some response messages already send
+  // multiple objects per message.
+  // When the limit is smaller than 0, it will be normalized to 2147483647
+  // on the server side. When limit is not set, it defaults to 0, and no
+  // results are send in the response.
+  int32 limit = 2;
 }
 
 message PaginationCursor {
@@ -151,8 +151,8 @@ message PaginationCursor {
 
 // https://git-scm.com/docs/git/#_options
 message GlobalOptions {
-    // Treat pathspecs literally (i.e. no globbing, no pathspec magic)
-    bool literal_pathspecs = 1;
+  // Treat pathspecs literally (i.e. no globbing, no pathspec magic)
+  bool literal_pathspecs = 1;
 }
 
 // SortDirection defines the sort direction.
diff --git a/proto/smarthttp.proto b/proto/smarthttp.proto
index f9e3977d6..2b8fdc97f 100644
--- a/proto/smarthttp.proto
+++ b/proto/smarthttp.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "lint.proto";
 import "shared.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 service SmartHTTPService {
   // The response body for GET /info/refs?service=git-upload-pack
   // Will be invoked when the user executes a `git fetch`, meaning the server
@@ -87,7 +87,8 @@ message PostUploadPackWithSidechannelRequest {
   string git_protocol = 3;
 }
 
-message PostUploadPackWithSidechannelResponse { }
+message PostUploadPackWithSidechannelResponse {
+}
 
 message PostReceivePackRequest {
   // repository should only be present in the first message of the stream
diff --git a/proto/ssh.proto b/proto/ssh.proto
index 732d26a2c..fbbb734bd 100644
--- a/proto/ssh.proto
+++ b/proto/ssh.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "lint.proto";
 import "shared.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 service SSHService {
   // To forward 'git upload-pack' to Gitaly for SSH sessions
   rpc SSHUploadPack(stream SSHUploadPackRequest) returns (stream SSHUploadPackResponse) {
@@ -72,7 +72,8 @@ message SSHUploadPackWithSidechannelRequest {
   string git_protocol = 3;
 }
 
-message SSHUploadPackWithSidechannelResponse {}
+message SSHUploadPackWithSidechannelResponse {
+}
 
 message SSHReceivePackRequest {
   // 'repository' must be present in the first message.
diff --git a/proto/transaction.proto b/proto/transaction.proto
index bccd2ab6b..a21b402e7 100644
--- a/proto/transaction.proto
+++ b/proto/transaction.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package gitaly;
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-
 import "lint.proto";
 import "shared.proto";
 
+option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
+
 service RefTransaction {
   option (intercepted) = true;
 
@@ -59,4 +59,5 @@ message StopTransactionRequest {
   uint64 transaction_id = 2;
 }
 
-message StopTransactionResponse {}
+message StopTransactionResponse {
+}
diff --git a/proto/wiki.proto b/proto/wiki.proto
index dd41bc257..80c34b522 100644
--- a/proto/wiki.proto
+++ b/proto/wiki.proto
@@ -1,10 +1,10 @@
 syntax = "proto3";
 
+package gitaly;
+
 import "lint.proto";
 import "shared.proto";
 
-package gitaly;
-
 option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
 
 service WikiService {
diff --git a/ruby/proto/gitaly/commit_pb.rb b/ruby/proto/gitaly/commit_pb.rb
index 1e331cd1f..e501fcf34 100644
--- a/ruby/proto/gitaly/commit_pb.rb
+++ b/ruby/proto/gitaly/commit_pb.rb
@@ -1,9 +1,9 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: commit.proto
 
+require 'google/protobuf/timestamp_pb'
 require 'lint_pb'
 require 'shared_pb'
-require 'google/protobuf/timestamp_pb'
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
diff --git a/ruby/proto/gitaly/conflicts_pb.rb b/ruby/proto/gitaly/conflicts_pb.rb
index 1338cf2d5..1dcc1cdbe 100644
--- a/ruby/proto/gitaly/conflicts_pb.rb
+++ b/ruby/proto/gitaly/conflicts_pb.rb
@@ -1,9 +1,9 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: conflicts.proto
 
+require 'google/protobuf/timestamp_pb'
 require 'lint_pb'
 require 'shared_pb'
-require 'google/protobuf/timestamp_pb'
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
diff --git a/ruby/proto/gitaly/internal_pb.rb b/ruby/proto/gitaly/internal_pb.rb
index ecf1659b4..6c6902907 100644
--- a/ruby/proto/gitaly/internal_pb.rb
+++ b/ruby/proto/gitaly/internal_pb.rb
@@ -1,8 +1,8 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: internal.proto
 
-require 'lint_pb'
 require 'google/protobuf/timestamp_pb'
+require 'lint_pb'
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
diff --git a/ruby/proto/gitaly/operations_pb.rb b/ruby/proto/gitaly/operations_pb.rb
index 783c34a62..043f785d9 100644
--- a/ruby/proto/gitaly/operations_pb.rb
+++ b/ruby/proto/gitaly/operations_pb.rb
@@ -1,10 +1,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: operations.proto
 
-require 'lint_pb'
-require 'shared_pb'
 require 'errors_pb'
 require 'google/protobuf/timestamp_pb'
+require 'lint_pb'
+require 'shared_pb'
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
diff --git a/ruby/proto/gitaly/praefect_pb.rb b/ruby/proto/gitaly/praefect_pb.rb
index 143db977d..7031b6043 100644
--- a/ruby/proto/gitaly/praefect_pb.rb
+++ b/ruby/proto/gitaly/praefect_pb.rb
@@ -1,9 +1,9 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: praefect.proto
 
+require 'google/protobuf/timestamp_pb'
 require 'lint_pb'
 require 'shared_pb'
-require 'google/protobuf/timestamp_pb'
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
diff --git a/ruby/proto/gitaly/ref_pb.rb b/ruby/proto/gitaly/ref_pb.rb
index 4424cf61b..2a7163932 100644
--- a/ruby/proto/gitaly/ref_pb.rb
+++ b/ruby/proto/gitaly/ref_pb.rb
@@ -1,9 +1,9 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: ref.proto
 
+require 'google/protobuf/timestamp_pb'
 require 'lint_pb'
 require 'shared_pb'
-require 'google/protobuf/timestamp_pb'
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do