Skip to content

Commit 52abba4

Browse files
committed
Remove mergeability check from Stage button
Fixes: QTQAINFRA-4719 Change-Id: I648231987dde1a75ccdd54b59f718a28c4b9a2a9 Reviewed-by: Friedemann Kleint <[email protected]>
1 parent bec6cfe commit 52abba4

File tree

1 file changed

+2
-8
lines changed
  • src/main/java/com/googlesource/gerrit/plugins/qtcodereview

1 file changed

+2
-8
lines changed

src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtStage.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (C) 2020-21 The Qt Company
2+
// Copyright (C) 2020-22 The Qt Company
33
//
44

55
package com.googlesource.gerrit.plugins.qtcodereview;
@@ -305,12 +305,6 @@ public UiAction.Description getDescription(RevisionResource resource) {
305305
} catch (ResourceConflictException e) {
306306
return null; // stage not visible
307307
}
308-
Boolean enabled;
309-
// try {
310-
enabled = cd.isMergeable();
311-
// } catch (OrmException e) {
312-
// throw new OrmRuntimeException("Could not determine mergeability", e);
313-
// }
314308

315309
ObjectId revId = resource.getPatchSet().commitId();
316310
Map<String, String> params =
@@ -322,6 +316,6 @@ public UiAction.Description getDescription(RevisionResource resource) {
322316
.setLabel(label)
323317
.setTitle(Strings.emptyToNull(titlePattern.replace(params)))
324318
.setVisible(true)
325-
.setEnabled(Boolean.TRUE.equals(enabled));
319+
.setEnabled(true);
326320
}
327321
}

0 commit comments

Comments
 (0)