Merge branch 'master' into feature/2785-middleware

proto/invitations/invitations.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/wrappers.proto";
+import "common/common.proto";
 
 option go_package = "git.perx.ru/perxis/perxis-go/proto/invitations;invitations";
 
@@ -28,12 +29,6 @@ message Filter {
   repeated string role = 6;
 }
 
-message FindOptions {
-  repeated string sort = 1;
-  int32 page_num = 2;
-  int32 page_size = 3;
-}
-
 message CreateRequest {
   Invitation invitation = 1;
 }
@@ -69,7 +64,7 @@ message AcceptInvitationResponse {}
 
 message FindRequest {
   Filter filter = 1;
-  FindOptions opts = 2;
+  common.FindOptions options = 3;
 }
 
 message FindResponse {

proto/organizations/organizations.proto

@@ -49,7 +49,7 @@ message Filter {
 
 message FindRequest {
   Filter filter = 1;
-  common.FindOptions opts = 2;
+  common.FindOptions options = 2;
 }
 
 message FindResponse {