Merge with develop branch

CHANGELOG.md

@@ -15,6 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Send mercurial hook callbacks over separate tcp socket instead of http ([#1416](https://github.com/scm-manager/scm-manager/pull/1416))
 
+### Fixed
+- Language detection of files with interpreter parameters e.g.: `#!/usr/bin/make -f` ([#1450](https://github.com/scm-manager/scm-manager/issues/1450))
+
 ## [2.10.1] - 2020-11-24
 ### Fixed
 - Improved logging of failures during plugin installation ([#1442](https://github.com/scm-manager/scm-manager/pull/1442))

pom.xml

@@ -464,7 +464,7 @@
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
-        <version>3.17.2</version>
+        <version>3.18.0</version>
         <scope>test</scope>
       </dependency>
 

scm-webapp/pom.xml

@@ -315,7 +315,7 @@
     <dependency>
       <groupId>com.github.sdorra</groupId>
       <artifactId>spotter-core</artifactId>
-      <version>3.0.0</version>
+      <version>3.0.1</version>
     </dependency>
 
     <dependency>