summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-03-05 16:15:25 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-03-05 16:15:25 +0000
commit97330be9a52f84b2ced5b80a68e4a5bee47870ed (patch)
tree6c8aa5f6908644bac40f315e48cc72ef2ad838a5 /spec/features
parent9f59101fb980dc264105814455d2553dde4fd174 (diff)
parenta9c80dceb688623e8f06a925caf629fddfa180ec (diff)
downloadgitlab-ce-97330be9a52f84b2ced5b80a68e4a5bee47870ed.tar.gz
Merge branch 'format-timeago-date' into 'master'
Formats timeago dates to be more friendly Closes #27537 See merge request !9145
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/commits_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index 324ede798fe..0e305c52358 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -192,7 +192,7 @@ describe 'Commits' do
commits = project.repository.commits(branch_name)
commits.each do |commit|
- expect(page).to have_content("committed #{commit.committed_date}")
+ expect(page).to have_content("committed #{commit.committed_date.strftime("%b %d, %Y")}")
end
end
end