Merge branch 'stable-2.15'
* stable-2.15: Reduce noise when a project cannot be found ReviewInput: Remove unused strictLabels attribute Fix support for python3 in tools/js/bower2bazel.py Show helpful message when adding group member 404s Fix index ssh commands with elasticsearch type Remove modifierPressed check from change list view Change-Id: I632dcda8bcd7044e47004078627aaae63039feb8
This commit is contained in:
@@ -35,15 +35,6 @@ public class ReviewInput {
|
||||
public Map<String, List<CommentInput>> comments;
|
||||
public Map<String, List<RobotCommentInput>> robotComments;
|
||||
|
||||
/**
|
||||
* If true require all labels to be within the user's permitted ranges based on access controls,
|
||||
* attempting to use a label not granted to the user will fail the entire modify operation early.
|
||||
* If false the operation will execute anyway, but the proposed labels given by the user will be
|
||||
* modified to be the "best" value allowed by the access controls, or ignored if the label does
|
||||
* not exist.
|
||||
*/
|
||||
public boolean strictLabels = true;
|
||||
|
||||
/**
|
||||
* How to process draft comments already in the database that were not also described in this
|
||||
* input request.
|
||||
@@ -66,8 +57,6 @@ public class ReviewInput {
|
||||
* on behalf of this named user instead of the caller. Caller must have the labelAs-$NAME
|
||||
* permission granted for each label that appears in {@link #labels}. This is in addition to the
|
||||
* named user also needing to have permission to use the labels.
|
||||
*
|
||||
* <p>{@link #strictLabels} impacts how labels is processed for the named user, not the caller.
|
||||
*/
|
||||
public String onBehalfOf;
|
||||
|
||||
|
||||
@@ -413,9 +413,7 @@ public class WebAppInitializer extends GuiceServletContextListener implements Fi
|
||||
false,
|
||||
sysInjector.getInstance(DownloadConfig.class),
|
||||
sysInjector.getInstance(LfsPluginAuthCommand.Module.class)));
|
||||
if (indexType == IndexType.LUCENE) {
|
||||
modules.add(new IndexCommandsModule());
|
||||
}
|
||||
modules.add(new IndexCommandsModule());
|
||||
return sysInjector.createChildInjector(modules);
|
||||
}
|
||||
|
||||
|
||||
@@ -544,7 +544,7 @@ public class Daemon extends SiteProgram {
|
||||
slave,
|
||||
sysInjector.getInstance(DownloadConfig.class),
|
||||
sysInjector.getInstance(LfsPluginAuthCommand.Module.class)));
|
||||
if (!slave && indexType == IndexType.LUCENE) {
|
||||
if (!slave) {
|
||||
modules.add(new IndexCommandsModule());
|
||||
}
|
||||
return sysInjector.createChildInjector(modules);
|
||||
|
||||
@@ -154,7 +154,7 @@ public class ProjectCacheImpl implements ProjectCache {
|
||||
Throwables.throwIfInstanceOf(e.getCause(), IOException.class);
|
||||
throw new IOException(e);
|
||||
}
|
||||
log.warn("Cannot find project {}", projectName.get(), e);
|
||||
log.debug("Cannot find project {}", projectName.get(), e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user