merge with branch 1.x

2025-11-14 09:25:43 +01:00 · 2017-01-12 19:50:39 +01:00
parent 5332ac2466 b5aaf1ca4e
commit bad99919f4
250 changed files with 16399 additions and 1573 deletions
--- a/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceManager.java
@@ -146,6 +146,9 @@ public abstract class AbstractResourceManager implements ResourceManager
        processPlugin(resources, plugin.getPlugin());
      }
    }
+    
+    // fix order of script resources, see https://goo.gl/ok03l4
+    Collections.sort(resources);

    return resources;
  }