Commit cff568c7 authored by Stan Hu's avatar Stan Hu

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

Change inconsistent capitalization

See merge request gitlab-org/gitlab!56580
parents 0805b784 606d8462
......@@ -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
......
......@@ -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'."
......
......@@ -16650,9 +16650,6 @@ msgstr ""
msgid "Invalid Insights config file detected"
msgstr ""
msgid "Invalid Login or password"
msgstr ""
msgid "Invalid OS"
msgstr ""
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment