diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-27 17:04:02 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-27 17:04:02 +0000 |
| commit | b790506144e91eed158b782bc0247b1acca7f9d4 (patch) | |
| tree | 10c651a26b68490214484a646de94a9f0cccebf5 /app | |
| parent | cc50decab5b22628eafb6636b3e57f99094c7926 (diff) | |
| parent | a89c1bf645e4ca0ccc5df9d26c196652a247e82a (diff) | |
| download | gitlab-ce-b790506144e91eed158b782bc0247b1acca7f9d4.tar.gz | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 6e593d3c86b..1176bec8873 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 |