Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 3 deletions

diff --git a/lib/gitlab/email/common.rb b/lib/gitlab/email/common.rb
index afee8d9cd3d..01316995c4d 100644
--- a/lib/gitlab/email/common.rb
+++ b/lib/gitlab/email/common.rb
@@ -54,6 +54,10 @@ module Gitlab
         # It's looking for each <...>
         references.scan(/(?!<)[^<>]+(?=>)/)
       end
+
+      def encrypted_secrets
+        Settings.encrypted(config.encrypted_secret_file)
+      end
     end
   end
 end
diff --git a/lib/gitlab/email/html_parser.rb b/lib/gitlab/email/html_parser.rb
index 27ba5d2a314..65117ac0141 100644
--- a/lib/gitlab/email/html_parser.rb
+++ b/lib/gitlab/email/html_parser.rb
@@ -18,9 +18,6 @@ module Gitlab
       end
 
       def filter_replies!
-        document.xpath('//blockquote').each(&:remove)
-        document.xpath('//table').each(&:remove)
-
         # bogus links with no href are sometimes added by outlook,
         # and can result in Html2Text adding extra square brackets
         # to the text, so we unwrap them here.