Adds the changes from bikebike/bikebike for tracked files that weren't committed to git.

Former-commit-id: 23acad3a6de4f349390d87a88884b754abefdcfb

app/controllers/application_controller.rb

@@ -232,20 +232,23 @@ class ApplicationController < BaseController
       request_info['env'][key.to_s] = value.to_s
     end
 
-    send_delayed_mail(:contact,
-        current_user || params[:email],
-        params[:subject],
-        params[:message],
-        email_list
-      )
+    if !(params[:subject] =~ /^\s*[a-z]{10}\s*$/i)
 
-    send_delayed_mail(:contact_details,
-        current_user || params[:email],
-        params[:subject],
-        params[:message],
-        request_info,
-        params
-      )
+        send_delayed_mail(:contact,
+            current_user || params[:email],
+            params[:subject],
+            params[:message],
+            email_list
+          )
+
+        send_delayed_mail(:contact_details,
+            current_user || params[:email],
+            params[:subject],
+            params[:message],
+            request_info,
+            params
+          )
+    end
 
     redirect_to contact_sent_path
   end

app/mailers/user_mailer.rb

@@ -149,6 +149,7 @@ class UserMailer < ActionMailer::Base
   end
 
   def contact(from, subject, message, email_list)
+    return if subject =~ /^[a-z]{10}$/
     @message = message
     @from = from.is_a?(Integer) ? User.find(from) : from
 
@@ -156,6 +157,7 @@ class UserMailer < ActionMailer::Base
   end
 
   def contact_details(from, subject, message, request, params)
+    return if subject =~ /^[a-z]{10}$/
     @message = message
     @from = from.is_a?(Integer) ? User.find(from) : from
     @request = request

app/views/layouts/application.html.haml

@@ -10,7 +10,7 @@
     = stylesheets
     %link{ href: asset_path(@favicon), rel: 'shortcut icon', type: 'image/x-icon' }
     %link{ href: asset_path(@favicon), rel: 'icon', type: 'image/x-icon' }
-    - @alt_lang_urls.each do |locale, url|
+    - (@alt_lang_urls || []).each do |locale, url|
       %link{ rel: :alternate, hreflang: locale, href: url }
     %link{ href: canonical_url, rel: :canonical }
     - if content_for?(:og_image)