Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

4 files changed, 4 insertions, 1 deletions

diff --git a/spec/lib/gitlab/auth/o_auth/auth_hash_spec.rb b/spec/lib/gitlab/auth/o_auth/auth_hash_spec.rb
index 67ffdee0c4a..69068883096 100644
--- a/spec/lib/gitlab/auth/o_auth/auth_hash_spec.rb
+++ b/spec/lib/gitlab/auth/o_auth/auth_hash_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Auth::OAuth::AuthHash do
-  let(:provider) { 'ldap'.freeze }
+  let(:provider) { 'ldap' }
   let(:auth_hash) do
     described_class.new(
       OmniAuth::AuthHash.new(
diff --git a/spec/lib/gitlab/auth/otp/strategies/devise_spec.rb b/spec/lib/gitlab/auth/otp/strategies/devise_spec.rb
index 0c88421d456..e51705bdb9c 100644
--- a/spec/lib/gitlab/auth/otp/strategies/devise_spec.rb
+++ b/spec/lib/gitlab/auth/otp/strategies/devise_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe Gitlab::Auth::Otp::Strategies::Devise do
   let_it_be(:user) { create(:user) }
+
   let(:otp_code) { 42 }
 
   subject(:validate) { described_class.new(user).validate(otp_code) }
diff --git a/spec/lib/gitlab/auth/otp/strategies/forti_authenticator_spec.rb b/spec/lib/gitlab/auth/otp/strategies/forti_authenticator_spec.rb
index 88a245b6b10..dc20df98185 100644
--- a/spec/lib/gitlab/auth/otp/strategies/forti_authenticator_spec.rb
+++ b/spec/lib/gitlab/auth/otp/strategies/forti_authenticator_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe Gitlab::Auth::Otp::Strategies::FortiAuthenticator do
   let_it_be(:user) { create(:user) }
+
   let(:otp_code) { 42 }
 
   let(:host) { 'forti_authenticator.example.com' }
diff --git a/spec/lib/gitlab/auth/otp/strategies/forti_token_cloud_spec.rb b/spec/lib/gitlab/auth/otp/strategies/forti_token_cloud_spec.rb
index 368cf98dfec..57ee53a452e 100644
--- a/spec/lib/gitlab/auth/otp/strategies/forti_token_cloud_spec.rb
+++ b/spec/lib/gitlab/auth/otp/strategies/forti_token_cloud_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe Gitlab::Auth::Otp::Strategies::FortiTokenCloud do
   let_it_be(:user) { create(:user) }
+
   let(:otp_code) { 42 }
 
   let(:url) { 'https://ftc.example.com:9696/api/v1' }