opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  Fix invalid json example in POST access endpoint
  gerrit_plugin: Don't add Implementation-Vendor manifest entry

Change-Id: I29a25ed5ff9c158e11085ce60d9d0917b6373a5f
This commit is contained in:
David Pursehouse 2017-12-19 09:52:38 +09:00
commit 4309f56243
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/rest-api-projects.txt
View File

@ -1081,12 +1081,14 @@ As result a link:#project-access-info[ProjectAccessInfo] entity is returned.
{ {
"remove": [ "remove": [
"refs/*": { {
"permissions": { "refs/*": {
"read": { "permissions": {
"rules": { "read": {
"c2ce4749a32ceb82cd6adcce65b8216e12afb41c": { "rules": {
"action": "ALLOW" "c2ce4749a32ceb82cd6adcce65b8216e12afb41c": {
"action": "ALLOW"
}
} }
} }
} }

5
tools/bzl/plugin.bzl
View File

@ -44,10 +44,7 @@ def gerrit_plugin(
native.java_binary( native.java_binary(
name = '%s__non_stamped' % name, name = '%s__non_stamped' % name,
deploy_manifest_lines = manifest_entries + [ deploy_manifest_lines = manifest_entries + ["Gerrit-ApiType: plugin"],
"Gerrit-ApiType: plugin",
"Implementation-Vendor: Gerrit Code Review",
],
main_class = 'Dummy', main_class = 'Dummy',
runtime_deps = [ runtime_deps = [
':%s__plugin' % name, ':%s__plugin' % name,