diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-03-27 16:25:15 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-03-27 16:25:15 +0200 |
| commit | bad8ec4d1d7b6e7b335b4fa18d3c66e6b746ac12 (patch) | |
| tree | 9107c4cc81eecac5a87afb8550de51c01acd6025 /sonar-ws | |
| parent | bd78c6d9b0856cfae5e7a446647e350eb186ed67 (diff) | |
| parent | 29bcb44528a2bf2d1ac7aa7715f38f5164e498aa (diff) | |
| download | sonarqube-bad8ec4d1d7b6e7b335b4fa18d3c66e6b746ac12.tar.gz sonarqube-bad8ec4d1d7b6e7b335b4fa18d3c66e6b746ac12.zip | |
Merge remote-tracking branch 'origin/branch-6.3'
Diffstat (limited to 'sonar-ws')
| -rw-r--r-- | sonar-ws/src/main/protobuf/ws-commons.proto | 11 | ||||
| -rw-r--r-- | sonar-ws/src/main/protobuf/ws-issues.proto | 19 |
2 files changed, 16 insertions, 14 deletions
diff --git a/sonar-ws/src/main/protobuf/ws-commons.proto b/sonar-ws/src/main/protobuf/ws-commons.proto index 6f9c6805103..50a4fa4268c 100644 --- a/sonar-ws/src/main/protobuf/ws-commons.proto +++ b/sonar-ws/src/main/protobuf/ws-commons.proto @@ -72,17 +72,6 @@ enum RuleStatus { REMOVED = 3; } -message User { - optional string login = 1; - optional string name = 2; - optional string email = 3; - optional bool active = 4; -} - -message Users { - repeated User users = 1; -} - // Lines start at 1 and line offsets start at 0 message TextRange { // Start line. Should never be absent diff --git a/sonar-ws/src/main/protobuf/ws-issues.proto b/sonar-ws/src/main/protobuf/ws-issues.proto index a2d1aa67a2f..4e31149efcf 100644 --- a/sonar-ws/src/main/protobuf/ws-issues.proto +++ b/sonar-ws/src/main/protobuf/ws-issues.proto @@ -41,7 +41,7 @@ message SearchWsResponse { repeated Issue issues = 6; repeated Component components = 7; optional sonarqube.ws.commons.Rules rules = 8; - optional sonarqube.ws.commons.Users users = 9; + optional Users users = 9; // Deprecated since 5.5, action plan has been removed optional ActionPlans unusedActionPlans = 10; @@ -54,7 +54,7 @@ message Operation { optional Issue issue = 1; repeated Component components = 2; repeated sonarqube.ws.commons.Rule rules = 3; - repeated sonarqube.ws.commons.User users = 4; + repeated Users.User users = 4; // Deprecated since 5.5, action plan has been removed repeated ActionPlan actiunusedActionPlansonPlans = 5; } @@ -191,9 +191,11 @@ message ChangelogWsResponse { message Changelog { optional string user = 1; optional string userName = 2; - optional string email = 3; + // Email is no more returned since 6.3 + optional string deprecatedEmail = 3; optional string creationDate = 4; repeated Diff diffs = 5; + optional string avatar = 6; message Diff { optional string key = 1; @@ -211,5 +213,16 @@ message BulkChangeWsResponse { optional int64 failures = 4; } +message Users { + repeated User users = 1; + + message User { + optional string login = 1; + optional string name = 2; + optional string avatar = 3; + optional bool active = 4; + } +} + |