diff options
author | Nick Thomas <nick@gitlab.com> | 2018-02-19 11:39:54 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-02-19 11:39:54 +0000 |
commit | 4ff5b76689de5498b1aa5379b9551d6d35330354 (patch) | |
tree | 885c5a366b6c320e4d1be025fce071dde65ae11b /app | |
parent | 53f290b6f7802b6b56e36a1339100c0e67030b1c (diff) | |
parent | 46e6a9f8a0f2dc0ae4e3152646f319a7cb5abcb2 (diff) | |
download | gitlab-ce-4ff5b76689de5498b1aa5379b9551d6d35330354.tar.gz |
Merge branch 'sh-guard-read-only-user-updates' into 'master'
Don't attempt to update user tracked fields if database is in read-only
Closes gitlab-ee#4972
See merge request gitlab-org/gitlab-ce!17200
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) |