Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/gitlab/octokit/middleware.rb b/lib/gitlab/octokit/middleware.rb
index a92860f7eb8..0e47672bb3c 100644
--- a/lib/gitlab/octokit/middleware.rb
+++ b/lib/gitlab/octokit/middleware.rb
@@ -11,7 +11,8 @@ module Gitlab
         Gitlab::UrlBlocker.validate!(env[:url],
           schemes: %w[http https],
           allow_localhost: allow_local_requests?,
-          allow_local_network: allow_local_requests?
+          allow_local_network: allow_local_requests?,
+          dns_rebind_protection: dns_rebind_protection?
         )
 
         @app.call(env)
@@ -22,6 +23,10 @@ module Gitlab
       def allow_local_requests?
         Gitlab::CurrentSettings.allow_local_requests_from_web_hooks_and_services?
       end
+
+      def dns_rebind_protection?
+        Gitlab::CurrentSettings.dns_rebinding_protection_enabled?
+      end
     end
   end
 end