Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 30 deletions

diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index 519eb49658a..d07d6440c6b 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -44,7 +44,7 @@ module Gitlab
     end
 
     def issues
-      if project && project.jira_tracker?
+      if project&.external_references_supported?
         if project.issues_enabled?
           @references[:all_issues] ||= references(:external_issue) + references(:issue)
         else
diff --git a/lib/omni_auth/strategies/saml.rb b/lib/omni_auth/strategies/saml.rb
deleted file mode 100644
index ebe062f17e0..00000000000
--- a/lib/omni_auth/strategies/saml.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module OmniAuth
-  module Strategies
-    class SAML
-      extend ::Gitlab::Utils::Override
-
-      # NOTE: This method duplicates code from omniauth-saml
-      #       so that we can access authn_request to store it
-      #       See: https://github.com/omniauth/omniauth-saml/issues/172
-      override :request_phase
-      def request_phase
-        authn_request = OneLogin::RubySaml::Authrequest.new
-
-        store_authn_request_id(authn_request)
-
-        with_settings do |settings|
-          redirect(authn_request.create(settings, additional_params_for_authn_request))
-        end
-      end
-
-      private
-
-      def store_authn_request_id(authn_request)
-        Gitlab::Auth::Saml::OriginValidator.new(session).store_origin(authn_request)
-      end
-    end
-  end
-end