Merge "Fix default file name for code owner configs if file extension is configured"
diff --git a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigTest.java
index e3e9e6a..433922f 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigTest.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigTest.java
@@ -60,7 +60,7 @@
}
@Test
- public void getProject() throws Exception {
+ public void testGetProject() throws Exception {
Project.NameKey project = Project.nameKey("project");
CodeOwnerConfig.Key codeOwnerConfigKey =
CodeOwnerConfig.Key.create(project, "master", "/foo/bar/");
diff --git a/web/owner-status-column.ts b/web/owner-status-column.ts
index dbe82fd..9b0cb86 100644
--- a/web/owner-status-column.ts
+++ b/web/owner-status-column.ts
@@ -23,7 +23,7 @@
import {css, html, LitElement, nothing, PropertyValues} from 'lit';
import {customElement, property} from 'lit/decorators';
import {OwnerStatus} from './code-owners-api';
-import {FileStatus} from './code-owners-model';
+import {FileStatus, PluginState} from './code-owners-model';
import {CodeOwnersModelMixin} from './code-owners-model-mixin';
// TODO: Extend the API for plugins.
@@ -128,6 +128,7 @@
) {
return true;
}
+ if (this.pluginStatus?.state !== PluginState.Enabled) return true;
if (this.change.status === 'MERGED') return true;
// if code-owners is not a submit requirement, don't show status column
if (
