The Unified and Autonomous Development Platform
Merge remote-tracking branch 'origin/master' into ssh-access
Andrea Del Bene5475b2ffaeb3
diff --cc pom.xmlindex d498ff3ba9,eca7787a6f..8e7be134ba--- a/pom.xml+++ b/pom.xml@@@ -585,8 -575,8 +580,8 @@@<hibernate.version>5.4.9.Final</hibernate.version><wicketbootstrap.version>0.10.18</wicketbootstrap.version><lucene.version>7.1.0</lucene.version>- <shiro.version>1.4.0</shiro.version>+ <shiro.version>1.4.2</shiro.version>- <jgit.version>5.1.3.201810200350-r</jgit.version>+ <jgit.version>5.2.0.201812061821-r</jgit.version><flexmark.version>0.18.3</flexmark.version><groovy.version>2.4.14</groovy.version><servlet.version>3.1.0</servlet.version>diff --cc server-core/src/main/java/io/onedev/server/model/User.javaindex 420bb2e66a,c2659fb444..c2633f35b6--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@@ -23,13 -25,15 +23,14 @@@ import org.hibernate.annotations.Cacheimport org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.Email;import org.hibernate.validator.constraints.NotEmpty;-import com.fasterxml.jackson.annotation.JsonView;import com.google.common.base.MoreObjects;- import io.onedev.server.model.support.NamedBuildQuery;+import io.onedev.server.model.support.NamedProjectQuery;import io.onedev.server.model.support.QuerySetting;- import io.onedev.server.model.support.UserBuildSetting;import io.onedev.server.model.support.WebHook;+ import io.onedev.server.model.support.build.NamedBuildQuery;+ import io.onedev.server.model.support.build.UserBuildSetting;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.util.SecurityUtils;diff --cc server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex da9ae88686,24001c3453..d22da4c56b--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@@ -89,10 -96,9 +96,10 @@@ public abstract class UserPage extendstabs.add(new UserTab("Edit Avatar", "fa fa-fw fa-picture-o", UserAvatarPage.class));tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", UserPasswordPage.class));+ tabs.add(new UserTab("Sssh Keys", "fa fa-fw fa-lock", UserSshKeysPage.class));tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", UserAuthorizationsPage.class));- tabs.add(new UserTab("Build Setting", "fa fa-fw fa-cubes", UserSecretsPage.class, UserBuildSettingPage.class));+ tabs.add(new UserTab("Build Setting", "fa fa-fw fa-cubes", UserJobSecretsPage.class, UserBuildSettingPage.class));tabs.add(new UserTab("Web Hooks", "fa fa-fw fa-volume-up", UserWebHooksPage.class, UserWebHooksPage.class));return tabs;diff --cc server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 5ebc0994bf,8f31855503..b1db89f8d8--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@@ -46,10 -47,9 +46,10 @@@ import io.onedev.server.web.page.base.Bimport io.onedev.server.web.page.my.MyPage;import io.onedev.server.web.page.my.avatar.MyAvatarPage;import io.onedev.server.web.page.my.buildsetting.MyBuildSettingPage;- import io.onedev.server.web.page.my.buildsetting.MySecretsPage;+ import io.onedev.server.web.page.my.buildsetting.MyJobSecretsPage;import io.onedev.server.web.page.my.password.MyPasswordPage;import io.onedev.server.web.page.my.profile.MyProfilePage;+import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;import io.onedev.server.web.page.my.webhook.MyWebHooksPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.security.LoginPage;@@@ -203,13 -203,8 +203,13 @@@ public abstract class LayoutPage extendif (getPage() instanceof MyPasswordPage)item.add(AttributeAppender.append("class", "active"));+ signedInContainer.add(item = new WebMarkupContainer("mySshKeys"));+ item.add(new ViewStateAwarePageLink<Void>("link", MySshKeysPage.class));+ if (getPage() instanceof MySshKeysPage)+ item.add(AttributeAppender.append("class", "active"));+signedInContainer.add(item = new WebMarkupContainer("myBuildSetting"));- item.add(new ViewStateAwarePageLink<Void>("link", MySecretsPage.class));+ item.add(new ViewStateAwarePageLink<Void>("link", MyJobSecretsPage.class));if (getPage() instanceof MyBuildSettingPage)item.add(AttributeAppender.append("class", "active"));