Skip to content
Snippets Groups Projects
Unverified Commit 4fadd50d authored by Stan Hu's avatar Stan Hu
Browse files

Update OpenSSL v3 callout to delay update to GitLab 17.7

This gives users more time to prepare for the upgrade.
parent 35bfc7f0
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -57,7 +57,7 @@ def show_registration_enabled_user_callout?
 
def show_openssl_callout?
return false unless Gitlab.version_info >= Gitlab::VersionInfo.new(17, 1) &&
Gitlab.version_info < Gitlab::VersionInfo.new(17, 5)
Gitlab.version_info < Gitlab::VersionInfo.new(17, 7)
 
current_user&.can_admin_all_resources? &&
!user_dismissed?(OPENSSL_CALLOUT) &&
Loading
Loading
- return unless show_openssl_callout?
 
-# rubocop:disable Gitlab/DocUrl -- This documentation section is only available in version 17.4 onward in GitLab.com.
- link = link_to('', 'https://docs.gitlab.com/ee/update/versions/gitlab_17_changes.html#1750', target: '_blank', rel: 'noopener noreferrer')
- link = link_to('', 'https://docs.gitlab.com/ee/update/versions/gitlab_17_changes.html#1770', target: '_blank', rel: 'noopener noreferrer')
-# rubocop:enable Gitlab/DocUrl
- message = safe_format(_('Starting with GitLab 17.5, OpenSSL 3 will be used. All TLS connections require TLS 1.2 or higher. Weaker ciphers are no longer supported. Encryption must have at least of 112 bits of security. %{link_start}Learn more%{link_end}.'), tag_pair(link, :link_start, :link_end))
- message = safe_format(_('Starting with GitLab 17.7, OpenSSL 3 will be used. All TLS connections require TLS 1.2 or higher. Weaker ciphers are no longer supported. Encryption must have at least of 112 bits of security. %{link_start}Learn more%{link_end}.'), tag_pair(link, :link_start, :link_end))
 
= render Pajamas::AlertComponent.new(title: _('OpenSSL version 3'),
variant: :warning,
Loading
Loading
Loading
Loading
@@ -52618,7 +52618,7 @@ msgstr ""
msgid "Started escalation for this incident."
msgstr ""
 
msgid "Starting with GitLab 17.5, OpenSSL 3 will be used. All TLS connections require TLS 1.2 or higher. Weaker ciphers are no longer supported. Encryption must have at least of 112 bits of security. %{link_start}Learn more%{link_end}."
msgid "Starting with GitLab 17.7, OpenSSL 3 will be used. All TLS connections require TLS 1.2 or higher. Weaker ciphers are no longer supported. Encryption must have at least of 112 bits of security. %{link_start}Learn more%{link_end}."
msgstr ""
 
msgid "Starting..."
Loading
Loading
@@ -8,7 +8,7 @@
let_it_be(:non_admin) { create(:user) }
let_it_be(:callout_title) { _('OpenSSL version 3') }
 
context 'when GitLab version is >= 17.1 and < 17.5' do
context 'when GitLab version is >= 17.1 and < 17.7' do
before do
stub_version('17.4.99', 'abcdefg')
end
Loading
Loading
@@ -66,9 +66,9 @@
end
end
 
context 'when GitLab version is >= 17.5' do
context 'when GitLab version is >= 17.7' do
before do
stub_version('17.5.0', 'abcdefg')
stub_version('17.7.0', 'abcdefg')
sign_in(admin)
end
 
Loading
Loading
Loading
Loading
@@ -123,9 +123,9 @@
where(:version, :current_user, :user_dismissed, :controller_path, :expected_result) do
'17.1.0' | ref(:admin) | false | 'admin' | true
'17.1.0' | ref(:admin) | false | 'admin/users' | true
'17.4.99' | ref(:admin) | false | 'admin' | true
'17.6.99' | ref(:admin) | false | 'admin' | true
'17.0.0' | ref(:admin) | false | 'admin' | false
'17.5.0' | ref(:admin) | false | 'admin' | false
'17.7.0' | ref(:admin) | false | 'admin' | false
'17.1.0' | ref(:user) | false | 'admin' | false
'17.1.0' | ref(:admin) | true | 'admin' | false
'17.1.0' | ref(:admin) | false | 'admin-' | false
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment