Merge "Bug fixes for gr-group-audit-log"
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 9a37f25..7938b17 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -1140,7 +1140,8 @@
[[change.allowBlame]]change.allowBlame::
+
-Allow blame on side by side diff. If set to false, blame cannot be used.
+Allow blame on side by side diff in the GWT UI. If set to false, blame cannot be
+used.
+
Default is true.
diff --git a/java/com/google/gerrit/server/restapi/change/GetBlame.java b/java/com/google/gerrit/server/restapi/change/GetBlame.java
index 6bba936..f5c8849 100644
--- a/java/com/google/gerrit/server/restapi/change/GetBlame.java
+++ b/java/com/google/gerrit/server/restapi/change/GetBlame.java
@@ -18,7 +18,6 @@
import com.google.common.collect.MultimapBuilder;
import com.google.gerrit.extensions.common.BlameInfo;
import com.google.gerrit.extensions.common.RangeInfo;
-import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.CacheControl;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.Response;
@@ -55,7 +54,6 @@
private final GitRepositoryManager repoManager;
private final BlameCache blameCache;
- private final boolean allowBlame;
private final ThreeWayMergeStrategy mergeStrategy;
private final AutoMerger autoMerger;
@@ -78,16 +76,11 @@
this.blameCache = blameCache;
this.mergeStrategy = MergeUtil.getMergeStrategy(cfg);
this.autoMerger = autoMerger;
- allowBlame = cfg.getBoolean("change", "allowBlame", true);
}
@Override
public Response<List<BlameInfo>> apply(FileResource resource)
throws RestApiException, OrmException, IOException, InvalidChangeOperationException {
- if (!allowBlame) {
- throw new BadRequestException("blame is disabled");
- }
-
Project.NameKey project = resource.getRevision().getChange().getProject();
try (Repository repository = repoManager.openRepository(project);
ObjectInserter ins = repository.newObjectInserter();
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html
index 1fc99b1..47c4651 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html
@@ -276,7 +276,7 @@
</span>
</div>
<div class="rightControls">
- <span class$="blameLoader [[_computeBlameLoaderClass(_isImageDiff, _isBlameSupported)]]">
+ <span class$="blameLoader [[_computeBlameLoaderClass(_isImageDiff)]]">
<gr-button
link
disabled="[[_isBlameLoading]]"
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
index 5df640e..9c27bae 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
@@ -148,10 +148,6 @@
type: Boolean,
computed: '_computeEditMode(_patchRange.*)',
},
- _isBlameSupported: {
- type: Boolean,
- value: false,
- },
_isBlameLoaded: Boolean,
_isBlameLoading: {
type: Boolean,
@@ -203,10 +199,6 @@
this._loggedIn = loggedIn;
});
- this.$.restAPI.getConfig().then(config => {
- this._isBlameSupported = config.change.allow_blame;
- });
-
this.$.cursor.push('diffs', this.$.diff);
},
@@ -972,8 +964,8 @@
});
},
- _computeBlameLoaderClass(isImageDiff, supported) {
- return !isImageDiff && supported ? 'show' : '';
+ _computeBlameLoaderClass(isImageDiff) {
+ return !isImageDiff ? 'show' : '';
},
_getRevisionInfo(change) {
