diff options
author | Stan Hu <stanhu@gmail.com> | 2018-02-17 21:29:22 -0800 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-02-17 21:30:29 -0800 |
commit | 46e6a9f8a0f2dc0ae4e3152646f319a7cb5abcb2 (patch) | |
tree | 9b5a2f638c67c3c46975827a794d019986508a7e /app | |
parent | 557db7e635c70bf68a15f7029014301013b30070 (diff) | |
download | gitlab-ce-46e6a9f8a0f2dc0ae4e3152646f319a7cb5abcb2.tar.gz |
Don't attempt to update user tracked fields if database is in read-onlysh-guard-read-only-user-updates
With Geo, attempting to view an endpoint with a user could result in an
Error 500 since Devise attempts to update the last sign-in IP and other
details.
Closes gitlab-org/gitlab-ee#4972
Diffstat (limited to 'app')
-rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 5e84d2da805..f5eeba27572 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -59,6 +59,8 @@ class User < ActiveRecord::Base # Override Devise::Models::Trackable#update_tracked_fields! # to limit database writes to at most once every hour def update_tracked_fields!(request) + return if Gitlab::Database.read_only? + update_tracked_fields(request) lease = Gitlab::ExclusiveLease.new("user_update_tracked_fields:#{id}", timeout: 1.hour.to_i) |