Fix dependency on non-existent fork of mail gem.

The fork of the mail gem we were depending on went away from github.
This was because the pull request actually wasn't valid at patching the
security issue. However, we had already addressed this security issue in
a different way, so we didn't actually need to depend on this fork
anyway.

src/api-umbrella/web-app/Gemfile

@@ -119,9 +119,7 @@ gem "daemons", "~> 1.2.2"
 gem "premailer-rails", "~> 1.8.0"
 gem "nokogiri", "~> 1.6.7.2"
 
-# Pull from git branch to get security patch for OSVDB-131677:
-# https://github.com/mikel/mail/pull/950
-gem "mail", "~> 2.5.4", :git => "https://github.com/wktk/mail.git", :branch => "2-5-stable"
+gem "mail", "~> 2.5.4"
 
 # Localization in the admin based on the Accept-Language header
 gem "http_accept_language", "~> 2.0.5"

src/api-umbrella/web-app/Gemfile.lock

@@ -51,15 +51,6 @@ GIT
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
 
-GIT
-  remote: https://github.com/wktk/mail.git
-  revision: 9a7826f7889ebe502969054b162f23344eed0c1c
-  branch: 2-5-stable
-  specs:
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-
 GIT
   remote: https://github.com/zerowidth/lucene_query_parser.git
   revision: ef723c40103203a55f85b3ec02743b17d4d5e773
@@ -280,6 +271,9 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.13)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.25.1)
     mini_portile2 (2.0.0)
     mongoid (3.1.7)
@@ -587,7 +581,7 @@ DEPENDENCIES
   kaminari-bootstrap (~> 0.1.3)
   kramdown (~> 1.6.0)
   lucene_query_parser!
-  mail (~> 2.5.4)!
+  mail (~> 2.5.4)
   mongoid (~> 3.1.6)
   mongoid-embedded-errors (~> 2.0.1)
   mongoid-store (~> 0.4.4)
@@ -662,4 +656,4 @@ DEPENDENCIES
   webmock (~> 1.21.0)
 
 BUNDLED WITH
-   1.11.2
+   1.12.4