commit ebd6eb130d0c0bc49a68002593e87b7ed82defe9
author David Pursehouse <david.pursehouse@sonymobile.com> Sat Jan 11 13:05:51 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 11 13:05:51 2014 +0000
tree 8eb2952d362629132381ce8e7a82ef956d6e1d31
parent a6dd936f11ad7d273351224eaaee7aa1aadee224
parent 731967591ef98ab3c94691ba9dc0f217630dda76

Merge "Buck: Preserve SNAPSHOT suffix in Maven artifact names" into stable-2.8

gerrit-server/src/main/java/com/google/gerrit/server/DefaultFileExtensionRegistry.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/DefaultFileExtensionRegistry.java b/gerrit-server/src/main/java/com/google/gerrit/server/DefaultFileExtensionRegistry.java
index bc41fea..be4a9e8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/DefaultFileExtensionRegistry.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/DefaultFileExtensionRegistry.java
@@ -40,6 +40,7 @@
       .put("go", newMimeType("text/x-go", 1))
       .put("cxx", newMimeType("text/x-c++src", 1))
       .put("hxx", newMimeType("text/x-c++hdr", 1))
+      .put("scala", newMimeType("text/x-scala", 1))
       .build();
 
   private static MimeType newMimeType(String type, final int specificity) {