diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-09 16:15:34 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-09 16:15:34 +0000 |
| commit | c7e980674ecfdb48c95e3328bb01d254374da1b8 (patch) | |
| tree | 019c98c562d0f24de01a381ac18e738bb101c87c | |
| parent | 2cedb243ee7cd146004b462763cbca3a4f0808a9 (diff) | |
| parent | d17e131f68939d3c74891fb381fbbf9e908c23ab (diff) | |
| download | gitlab-ce-c7e980674ecfdb48c95e3328bb01d254374da1b8.tar.gz | |
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
| -rw-r--r-- | changelogs/unreleased/rails5-mysql-fix-pr-importer-spec.yml | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/rails5-mysql-fix-pr-importer-spec.yml b/changelogs/unreleased/rails5-mysql-fix-pr-importer-spec.yml new file mode 100644 index 00000000000..afd9865ee45 --- /dev/null +++ b/changelogs/unreleased/rails5-mysql-fix-pr-importer-spec.yml @@ -0,0 +1,5 @@ +--- +title: Rails5 mysql fix milliseconds problem in pull request importer spec +merge_request: 20475 +author: Jasper Maes +type: fixed diff --git a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb index 51fad6c6838..b2e544e6fed 100644 --- a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb @@ -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 |