Commit c7e98067 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rails5-mysql-fix-pr-importer-spec' into 'master'

Rails5 mysql fix milliseconds problem in pull request importer spec

See merge request gitlab-org/gitlab-ce!20475
parents 2cedb243 d17e131f
---
title: Rails5 mysql fix milliseconds problem in pull request importer spec
merge_request: 20475
author: Jasper Maes
type: fixed
......@@ -27,9 +27,9 @@ describe Gitlab::GithubImport::Importer::PullRequestsImporter do
milestone: double(:milestone, number: 4),
user: double(:user, id: 4, login: 'alice'),
assignee: double(:user, id: 4, login: 'alice'),
created_at: Time.zone.now,
updated_at: Time.zone.now,
merged_at: Time.zone.now
created_at: 1.second.ago,
updated_at: 1.second.ago,
merged_at: 1.second.ago
)
end
......
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