Merge branch 'revert-incoming-email-patch-for-gitlab-com' into 'master'

Revert incoming email patch for GitLab.com

See merge request gitlab-org/gitlab-ee!5376

lib/gitlab/incoming_email.rb

@@ -52,8 +52,6 @@ module Gitlab
       private
 
       def address_regex
-        return /^incoming\+(.+)@(incoming\.)?gitlab\.com$/ if Gitlab.com?
-
         wildcard_address = config.address
         return nil unless wildcard_address
 

spec/lib/gitlab/incoming_email_spec.rb

@@ -87,25 +87,6 @@ describe Gitlab::IncomingEmail do
     it 'does not match emails with extra bits' do
       expect(described_class.key_from_address('somereplies+somekey@example.com.someotherdomain.com')).to be nil
     end
-
-    context "on GitLab.com" do
-      before do
-        allow(Gitlab).to receive(:com?).and_return(true)
-      end
-
-      it "returns the reply key when using @gitlab.com" do
-        expect(described_class.key_from_address("incoming+key@gitlab.com")).to eq("key")
-      end
-
-      it "returns the reply key when using @incoming.gitlab.com" do
-        expect(described_class.key_from_address("incoming+key@incoming.gitlab.com")).to eq("key")
-      end
-
-      it "does not match other addresses" do
-        expect(described_class.key_from_address("fooincoming+key@incoming.gitlab.com")).to be_nil
-        expect(described_class.key_from_address("incoming+key@incoming.gitlab.com.someotherdomain.com")).to be_nil
-      end
-    end
   end
 
   context 'self.key_from_fallback_message_id' do