diff options
Diffstat (limited to 'lib/gitlab/email')
6 files changed, 7 insertions, 66 deletions
diff --git a/lib/gitlab/email/handler/create_merge_request_handler.rb b/lib/gitlab/email/handler/create_merge_request_handler.rb index df12aea1988..c723c2762c7 100644 --- a/lib/gitlab/email/handler/create_merge_request_handler.rb +++ b/lib/gitlab/email/handler/create_merge_request_handler.rb @@ -61,7 +61,7 @@ module Gitlab private def build_merge_request - MergeRequests::BuildService.new(project: project, current_user: author, params: merge_request_params).execute + ::MergeRequests::BuildService.new(project: project, current_user: author, params: merge_request_params).execute end def create_merge_request @@ -78,7 +78,7 @@ module Gitlab if merge_request.errors.any? merge_request else - MergeRequests::CreateService.new(project: project, current_user: author).create(merge_request) + ::MergeRequests::CreateService.new(project: project, current_user: author).create(merge_request) end end diff --git a/lib/gitlab/email/hook/smime_signature_interceptor.rb b/lib/gitlab/email/hook/smime_signature_interceptor.rb index fe39589d019..0b092b3e41e 100644 --- a/lib/gitlab/email/hook/smime_signature_interceptor.rb +++ b/lib/gitlab/email/hook/smime_signature_interceptor.rb @@ -22,7 +22,7 @@ module Gitlab private def certificate - @certificate ||= Gitlab::Email::Smime::Certificate.from_files(key_path, cert_path, ca_certs_path) + @certificate ||= Gitlab::X509::Certificate.from_files(key_path, cert_path, ca_certs_path) end def key_path diff --git a/lib/gitlab/email/message/in_product_marketing/base.rb b/lib/gitlab/email/message/in_product_marketing/base.rb index 96551c89837..c4895d35a14 100644 --- a/lib/gitlab/email/message/in_product_marketing/base.rb +++ b/lib/gitlab/email/message/in_product_marketing/base.rb @@ -50,7 +50,7 @@ module Gitlab def cta_link case format when :html - link_to cta_text, group_email_campaigns_url(group, track: track, series: series), target: '_blank', rel: 'noopener noreferrer' + ActionController::Base.helpers.link_to cta_text, group_email_campaigns_url(group, track: track, series: series), target: '_blank', rel: 'noopener noreferrer' else [cta_text, group_email_campaigns_url(group, track: track, series: series)].join(' >> ') end @@ -89,7 +89,7 @@ module Gitlab case format when :html links.map do |text, link| - link_to(text, link) + ActionController::Base.helpers.link_to(text, link) end else '| ' + links.map do |text, link| diff --git a/lib/gitlab/email/message/in_product_marketing/helper.rb b/lib/gitlab/email/message/in_product_marketing/helper.rb index 4780e08322a..cec0aad44a6 100644 --- a/lib/gitlab/email/message/in_product_marketing/helper.rb +++ b/lib/gitlab/email/message/in_product_marketing/helper.rb @@ -7,7 +7,6 @@ module Gitlab module Helper include ActionView::Context include ActionView::Helpers::TagHelper - include ActionView::Helpers::UrlHelper private @@ -32,7 +31,7 @@ module Gitlab def link(text, link) case format when :html - link_to text, link + ActionController::Base.helpers.link_to text, link else "#{text} (#{link})" end diff --git a/lib/gitlab/email/message/in_product_marketing/trial.rb b/lib/gitlab/email/message/in_product_marketing/trial.rb index 222046a3966..11a799886ab 100644 --- a/lib/gitlab/email/message/in_product_marketing/trial.rb +++ b/lib/gitlab/email/message/in_product_marketing/trial.rb @@ -15,7 +15,7 @@ module Gitlab def tagline [ - s_('InProductMarketing|Start a free trial of GitLab Ultimate – no CC required'), + s_('InProductMarketing|Start a free trial of GitLab Ultimate – no credit card required'), s_('InProductMarketing|Improve app security with a 30-day trial'), s_('InProductMarketing|Start with a GitLab Ultimate free trial') ][series] diff --git a/lib/gitlab/email/smime/certificate.rb b/lib/gitlab/email/smime/certificate.rb deleted file mode 100644 index 3607b95b4bc..00000000000 --- a/lib/gitlab/email/smime/certificate.rb +++ /dev/null @@ -1,58 +0,0 @@ -# frozen_string_literal: true - -module Gitlab - module Email - module Smime - class Certificate - CERT_REGEX = /-----BEGIN CERTIFICATE-----(?:.|\n)+?-----END CERTIFICATE-----/.freeze - - attr_reader :key, :cert, :ca_certs - - def key_string - key.to_s - end - - def cert_string - cert.to_pem - end - - def ca_certs_string - ca_certs.map(&:to_pem).join('\n') unless ca_certs.blank? - end - - def self.from_strings(key_string, cert_string, ca_certs_string = nil) - key = OpenSSL::PKey::RSA.new(key_string) - cert = OpenSSL::X509::Certificate.new(cert_string) - ca_certs = load_ca_certs_bundle(ca_certs_string) - - new(key, cert, ca_certs) - end - - def self.from_files(key_path, cert_path, ca_certs_path = nil) - ca_certs_string = File.read(ca_certs_path) if ca_certs_path - - from_strings(File.read(key_path), File.read(cert_path), ca_certs_string) - end - - # Returns an array of OpenSSL::X509::Certificate objects, empty array if none found - # - # Ruby OpenSSL::X509::Certificate.new will only load the first - # certificate if a bundle is presented, this allows to parse multiple certs - # in the same file - def self.load_ca_certs_bundle(ca_certs_string) - return [] unless ca_certs_string - - ca_certs_string.scan(CERT_REGEX).map do |ca_cert_string| - OpenSSL::X509::Certificate.new(ca_cert_string) - end - end - - def initialize(key, cert, ca_certs = nil) - @key = key - @cert = cert - @ca_certs = ca_certs - end - end - end - end -end |