summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-13 06:09:37 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-13 06:09:37 +0000
commit0301a0cad0063d76b1607358dc6c711ea043fdda (patch)
tree894ac424a6fb370ad8dc5de4294cdc87f0ae164e /lib
parentdcce066c5059c4df112dce4a9edf288d74aec48b (diff)
downloadgitlab-ce-0301a0cad0063d76b1607358dc6c711ea043fdda.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/reference_extractor.rb2
-rw-r--r--lib/omni_auth/strategies/saml.rb29
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