diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-06-26 00:42:44 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-06-26 00:42:44 -0500 |
| commit | a89c1bf645e4ca0ccc5df9d26c196652a247e82a (patch) | |
| tree | c47afeb059d03cea8968a2ef3fcf83671cbf7515 /app | |
| parent | f0886918845f8292889db7e30033b7051147f3b0 (diff) | |
| download | gitlab-ce-a89c1bf645e4ca0ccc5df9d26c196652a247e82a.tar.gz | |
Fix application error when Project#last_activity_at is nil34276-fix-dashboard-page-when-last-activity-at-is-nil
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 2c2685875f8..11038c6d0d6 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -689,7 +689,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 |