From 1a44e0afdbcf3b45347c248b0b1decd5853bf69c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 11 Sep 2014 11:30:39 -0400 Subject: [PATCH] Merged #177 "Disable permission checkboxes if permission is inherited" --- src/main/java/com/gitblit/models/ServerStatus.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gitblit/models/ServerStatus.java b/src/main/java/com/gitblit/models/ServerStatus.java index f8afd00..bb6396b 100644 --- a/src/main/java/com/gitblit/models/ServerStatus.java +++ b/src/main/java/com/gitblit/models/ServerStatus.java @@ -39,8 +39,6 @@ public final String releaseDate; - public final boolean isGO; - public final Map<String, String> systemProperties; public final long heapMaximum; @@ -49,13 +47,14 @@ public volatile long heapFree; + public boolean isGO; + public String servletContainer; - public ServerStatus(boolean isGO) { + public ServerStatus() { this.bootDate = new Date(); this.version = Constants.getVersion(); this.releaseDate = Constants.getBuildDate(); - this.isGO = isGO; this.heapMaximum = Runtime.getRuntime().maxMemory(); -- Gitblit v1.9.1