The Unified and Autonomous Development Platform
Make select2 dragging js depending on base js
Robin Shen599d52d3f71f
diff --git a/core/src/main/java/io/onedev/server/git/GitFilter.java b/core/src/main/java/io/onedev/server/git/GitFilter.javaindex 766f541e8d..f841f1d862 100644--- a/core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/core/src/main/java/io/onedev/server/git/GitFilter.java@@ -31,8 +31,8 @@ import io.onedev.server.git.command.AdvertiseUploadRefsCommand;import io.onedev.server.git.command.ReceiveCommand;import io.onedev.server.git.command.UploadCommand;import io.onedev.server.git.exception.GitException;-import io.onedev.server.manager.SettingManager;import io.onedev.server.manager.ProjectManager;+import io.onedev.server.manager.SettingManager;import io.onedev.server.manager.StorageManager;import io.onedev.server.manager.WorkExecutor;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.java b/core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.javaindex 158c621d6d..e372791748 100644--- a/core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.java+++ b/core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.java@@ -32,13 +32,8 @@ public class DefaultUnitOfWork implements UnitOfWork {@Overrideprotected Session openObject() {Session session = persistManager.getSessionFactory().openSession();- try {- // Session is supposed to be able to write only in transactional methods- session.setHibernateFlushMode(FlushMode.MANUAL);- } catch (Exception e) {- session.close();- throw Throwables.propagate(e);- }+ // Session is supposed to be able to write only in transactional methods+ session.setHibernateFlushMode(FlushMode.MANUAL);return session;}diff --git a/core/src/main/java/io/onedev/server/web/component/select2/DragSortResourceReference.java b/core/src/main/java/io/onedev/server/web/component/select2/DragSortResourceReference.javaindex 5ec4554960..636ee70055 100644--- a/core/src/main/java/io/onedev/server/web/component/select2/DragSortResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/component/select2/DragSortResourceReference.java@@ -4,11 +4,11 @@ import java.util.List;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.request.resource.JavaScriptResourceReference;import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;-public class DragSortResourceReference extends JavaScriptResourceReference {+public class DragSortResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;