From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0
---
src/main/java/com/gitblit/models/UserPreferences.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/models/UserPreferences.java b/src/main/java/com/gitblit/models/UserPreferences.java
index 44e4493..90c034f 100644
--- a/src/main/java/com/gitblit/models/UserPreferences.java
+++ b/src/main/java/com/gitblit/models/UserPreferences.java
@@ -23,6 +23,7 @@
import java.util.Map;
import java.util.TreeMap;
+import com.gitblit.Constants.Transport;
import com.gitblit.utils.StringUtils;
/**
@@ -37,7 +38,11 @@
public final String username;
- public String locale;
+ private String locale;
+
+ private Boolean emailMeOnMyTicketChanges;
+
+ private Transport transport;
private final Map<String, UserRepositoryPreferences> repositoryPreferences = new TreeMap<String, UserRepositoryPreferences>();
@@ -56,6 +61,10 @@
return new Locale(lang, cc);
}
return new Locale(locale);
+ }
+
+ public void setLocale(String locale) {
+ this.locale = locale;
}
public UserRepositoryPreferences getRepositoryPreferences(String repositoryName) {
@@ -96,4 +105,23 @@
Collections.sort(list);
return list;
}
+
+ public boolean isEmailMeOnMyTicketChanges() {
+ if (emailMeOnMyTicketChanges == null) {
+ return true;
+ }
+ return emailMeOnMyTicketChanges;
+ }
+
+ public void setEmailMeOnMyTicketChanges(boolean value) {
+ this.emailMeOnMyTicketChanges = value;
+ }
+
+ public Transport getTransport() {
+ return transport;
+ }
+
+ public void setTransport(Transport transport) {
+ this.transport = transport;
+ }
}
--
Gitblit v1.9.1