Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-12 21:10:47 +08:00
Code Packages Activity Actions 7

Merge pull request #5449 from Supermathie/google_fix

Browse source 
FIX: google oauth flow should automatically update the google account used for login when appropriate
This commit is contained in:
Jeff Atwood 2017-12-21 17:46:43 -08:00 • committed by GitHub
commit cedfd6b68c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/locales/server.en.yml
View file

@ -139,6 +139,7 @@ en:
max_username_length_range: "You cannot set the maximum below the minimum."
default_categories_already_selected: "You cannot select a category used in another list."
s3_upload_bucket_is_required: "You cannot enable uploads to S3 unless you've provided the 's3_upload_bucket'."
conflicting_google_user_id: 'The Google Account ID for this account has changed, for protection this requires manual intervention. Please contact the site administrator with the following reference:<br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'

activemodel:
errors: