Merge branch 'sfang-fix-error-camelcase' into 'master'

Change inconsistent capitalization

See merge request gitlab-org/gitlab!56580

app/controllers/concerns/authenticates_with_two_factor.rb

@@ -70,7 +70,7 @@ module AuthenticatesWithTwoFactor
     elsif !user.confirmed?
       I18n.t('devise.failure.unconfirmed')
     else
-      _('Invalid Login or password')
+      _('Invalid login or password')
     end
   end
 

config/locales/devise.en.yml

@@ -9,10 +9,10 @@ en:
     failure:
       already_authenticated: "You are already signed in."
       inactive: "Your account is not activated yet."
-      invalid: "Invalid %{authentication_keys} or password."
+      invalid: "Invalid login or password."
       locked: "Your account is locked."
       last_attempt: "You have one more attempt before your account is locked."
-      not_found_in_database: "Invalid %{authentication_keys} or password."
+      not_found_in_database: "Invalid login or password."
       timeout: "Your session expired. Please sign in again to continue."
       unauthenticated: "You need to sign in or sign up before continuing."
       unconfirmed: "You have to confirm your email address before continuing. Please check your email for the link we sent you, or click 'Resend confirmation email'."

locale/gitlab.pot

@@ -16650,9 +16650,6 @@ msgstr ""
 msgid "Invalid Insights config file detected"
 msgstr ""
 
-msgid "Invalid Login or password"
-msgstr ""
-
 msgid "Invalid OS"
 msgstr ""
 

qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb

@@ -71,7 +71,7 @@ module QA
 
             Flow::Login.sign_in(as: user, skip_page_validation: true)
 
-            expect(page).to have_text("Invalid Login or password")
+            expect(page).to have_text("Invalid login or password")
 
             @recreated_user = Resource::User.fabricate_via_browser_ui! do |resource|
               resource.name = user.name

spec/controllers/sessions_controller_spec.rb

@@ -86,7 +86,7 @@ RSpec.describe SessionsController do
           post(:create, params: { user: { login: 'invalid', password: 'invalid' } })
 
           expect(response)
-            .to set_flash.now[:alert].to(/Invalid Login or password/)
+            .to set_flash.now[:alert].to(/Invalid login or password/)
         end
       end
 
@@ -348,7 +348,7 @@ RSpec.describe SessionsController do
             otp_user_id: user.id
           )
 
-          expect(response).to set_flash.now[:alert].to(/Invalid Login or password/)
+          expect(response).to set_flash.now[:alert].to(/Invalid login or password/)
         end
       end
 

spec/features/users/anonymous_sessions_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe 'Session TTLs', :clean_gitlab_redis_shared_state do
     fill_in 'user_password', with: '12345678'
     click_button 'Sign in'
 
-    expect(page).to have_content('Invalid Login or password')
+    expect(page).to have_content('Invalid login or password')
 
     expect_single_session_with_expiration(Settings.gitlab['unauthenticated_session_expire_delay'])
   end

spec/features/users/login_spec.rb

@@ -138,7 +138,7 @@ RSpec.describe 'Login' do
 
       gitlab_sign_in(User.ghost)
 
-      expect(page).to have_content('Invalid Login or password.')
+      expect(page).to have_content('Invalid login or password.')
     end
 
     it 'does not update Devise trackable attributes', :clean_gitlab_redis_shared_state do
@@ -406,7 +406,7 @@ RSpec.describe 'Login' do
 
         gitlab_sign_in(user)
 
-        expect(page).to have_content('Invalid Login or password.')
+        expect(page).to have_content('Invalid login or password.')
       end
     end
   end