Commit db14daf5 authored by Douwe Maan's avatar Douwe Maan

Merge branch...

Merge branch '32869-project-s-last-updated-time-not-accurately-reflected-in-projects-dashboard' into 'master'

Use last_activity_at attr when showing the update date in project listing

Closes #32869

See merge request !11896
parents 58722738 44affff3
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
- show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true && project.commit - 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 - css_class += " no-description" if project.description.blank? && !show_last_commit_as_description
- cache_key = project_list_cache_key(project) - cache_key = project_list_cache_key(project)
- updated_tooltip = time_ago_with_tooltip(project.updated_at) - updated_tooltip = time_ago_with_tooltip(project.last_activity_at)
%li.project-row{ class: css_class } %li.project-row{ class: css_class }
= cache(cache_key) do = cache(cache_key) do
......
...@@ -15,6 +15,15 @@ RSpec.describe 'Dashboard Projects', feature: true do ...@@ -15,6 +15,15 @@ RSpec.describe 'Dashboard Projects', feature: true do
expect(page).to have_content('awesome stuff') expect(page).to have_content('awesome stuff')
end end
it 'shows the last_activity_at attribute as the update date' do
now = Time.now
project.update_column(:last_activity_at, now)
visit dashboard_projects_path
expect(page).to have_xpath("//time[@datetime='#{now.getutc.iso8601}']")
end
context 'when on Starred projects tab' do context 'when on Starred projects tab' do
it 'shows only starred projects' do it 'shows only starred projects' do
user.toggle_star(project2) user.toggle_star(project2)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment