diff options
author | Robert Speicher <robert@gitlab.com> | 2017-05-04 21:46:10 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-05-04 21:46:10 +0000 |
commit | 79dc817183bf1480e72016c3e6a78ac0e57d8c96 (patch) | |
tree | 185532b890de2a21afbf67098773396096538394 /app | |
parent | 91e8f7702c7781ee8ccbbe9338500e616606af29 (diff) | |
parent | 6911baa13a082fbf6adf3695f16d859d6758a03c (diff) | |
download | gitlab-ce-79dc817183bf1480e72016c3e6a78ac0e57d8c96.tar.gz |
Merge branch '2274-store-last-repository-updated-at-ce' into 'master'
Port of "2274-store-last-repository-updated-at" to CE
See merge request !11085
Diffstat (limited to 'app')
-rw-r--r-- | app/models/event.rb | 6 | ||||
-rw-r--r-- | app/models/project.rb | 5 | ||||
-rw-r--r-- | app/models/project_wiki.rb | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index b780c1faf81..e6fad46077a 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -30,6 +30,7 @@ class Event < ActiveRecord::Base # Callbacks after_create :reset_project_activity + after_create :set_last_repository_updated_at, if: :push? # Scopes scope :recent, -> { reorder(id: :desc) } @@ -357,4 +358,9 @@ class Event < ActiveRecord::Base def recent_update? project.last_activity_at > RESET_PROJECT_ACTIVITY_INTERVAL.ago end + + def set_last_repository_updated_at + Project.unscoped.where(id: project_id). + update_all(last_repository_updated_at: created_at) + end end diff --git a/app/models/project.rb b/app/models/project.rb index 025db89ebfd..edbca3b537b 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -53,6 +53,11 @@ class Project < ActiveRecord::Base update_column(:last_activity_at, self.created_at) end + after_create :set_last_repository_updated_at + def set_last_repository_updated_at + update_column(:last_repository_updated_at, self.created_at) + end + after_destroy :remove_pages # update visibility_level of forks diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb index 70eef359cdd..189c106b70b 100644 --- a/app/models/project_wiki.rb +++ b/app/models/project_wiki.rb @@ -183,6 +183,6 @@ class ProjectWiki end def update_project_activity - @project.touch(:last_activity_at) + @project.touch(:last_activity_at, :last_repository_updated_at) end end |