diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-04 13:24:46 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-04 13:24:46 -0400 |
| commit | 86792760339ddf34c117a26f4cca8d296dbede7a (patch) | |
| tree | 7ee35a5fc1eaf9d35dd82c109c4bb8f0308fc599 /src | |
| parent | 8d9750ef65660ca2488fc8ff65ba9c1040143c71 (diff) | |
| parent | 2da1f2eae6354bae394e9513ddc1d66cdc13c7cb (diff) | |
| download | gitblit-86792760339ddf34c117a26f4cca8d296dbede7a.tar.gz gitblit-86792760339ddf34c117a26f4cca8d296dbede7a.zip | |
Merge branch 'ticket/149' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java index 46877168..b6c23591 100644 --- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java +++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java @@ -59,6 +59,7 @@ import com.gitblit.wicket.panels.AccessPolicyPanel; import com.gitblit.wicket.panels.BooleanChoiceOption;
import com.gitblit.wicket.panels.BooleanOption;
import com.gitblit.wicket.panels.RepositoryNamePanel;
+import com.google.common.base.Optional;
public class NewRepositoryPage extends RootSubPage {
@@ -243,7 +244,8 @@ public class NewRepositoryPage extends RootSubPage { try {
UserModel user = GitBlitWebSession.get().getUser();
- PersonIdent author = new PersonIdent(user.getDisplayName(), user.emailAddress);
+ String email = Optional.fromNullable(user.emailAddress).or(user.username + "@" + "gitblit");
+ PersonIdent author = new PersonIdent(user.getDisplayName(), email);
DirCache newIndex = DirCache.newInCore();
DirCacheBuilder indexBuilder = newIndex.builder();
|