summaryrefslogtreecommitdiff
path: root/app/models/event.rb
diff options
context:
space:
mode:
authorAndreas Brandl <abrandl@gitlab.com>2018-02-26 16:44:35 +0100
committerAndreas Brandl <abrandl@gitlab.com>2018-03-06 12:53:13 +0100
commit375a5c9f1e69a5fbf49a98cecc7f0c0cb61df989 (patch)
treef748f286a26b82535ad9b261806ee84bee6d66e1 /app/models/event.rb
parent8dde03012f0f3c66333916740483643b193664ad (diff)
downloadgitlab-ce-375a5c9f1e69a5fbf49a98cecc7f0c0cb61df989.tar.gz
Only track contributions if table is available.
This is due to the problem that the callback can be called while running an earlier database schema version (for example during earlier migrations). We work around this by checking the current schema version and only track contributions if the table is available.
Diffstat (limited to 'app/models/event.rb')
-rw-r--r--app/models/event.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/event.rb b/app/models/event.rb
index f0cc99a9242..e855ed02274 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -392,6 +392,9 @@ class Event < ActiveRecord::Base
end
def track_user_contributed_projects
- UserContributedProjects.track(self)
+ # Note the call to .available? is due to earlier migrations
+ # that would otherwise conflict with the call to .track
+ # (because the table does not exist yet).
+ UserContributedProjects.track(self) if UserContributedProjects.available?
end
end