From eb0d4e2615718d5dfe1ec332b5b7ccdd88693fd1 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Tue, 27 Jun 2017 17:04:02 +0000 Subject: Merge branch '34276-fix-dashboard-page-when-last-activity-at-is-nil' into 'master' Fix application error when Project#last_activity_at is nil Closes #34276 See merge request !12443 --- app/models/project.rb | 2 +- app/views/shared/projects/_project.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/models/project.rb b/app/models/project.rb index e1ee22b1a82..4b289d15ae7 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -704,7 +704,7 @@ class Project < ActiveRecord::Base end def last_activity_date - last_activity_at || updated_at + last_repository_updated_at || last_activity_at || updated_at end def project_id diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index fbc335f6176..8c3d6351ac2 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -7,7 +7,7 @@ - show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true && project.commit - css_class += " no-description" if project.description.blank? && !show_last_commit_as_description - cache_key = project_list_cache_key(project) -- updated_tooltip = time_ago_with_tooltip(project.last_activity_at) +- updated_tooltip = time_ago_with_tooltip(project.last_activity_date) %li.project-row{ class: css_class } = cache(cache_key) do -- cgit v1.2.3