From cbbb8ce91528e81d19d6eb150e9f2f61f0f098d2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 21 May 2014 08:44:33 -0400
Subject: [PATCH] Merge branch 'ticket/81' into develop
---
src/main/java/com/gitblit/Constants.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 2007c0a..95eb944 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -405,11 +405,11 @@
/**
* Enumeration of the feed content object types.
*/
- public static enum FeedContentObjectType {
+ public static enum FeedObjectType {
COMMIT, TAG;
- public static FeedContentObjectType forName(String name) {
- for (FeedContentObjectType type : values()) {
+ public static FeedObjectType forName(String name) {
+ for (FeedObjectType type : values()) {
if (type.name().equalsIgnoreCase(name)) {
return type;
}
--
Gitblit v1.9.1