diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-12-03 09:27:36 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-12-03 09:27:36 +0000 |
| commit | 843df4edd4428a8fbd65905712fb97d19d597f15 (patch) | |
| tree | f956e9e2c402d8175096717abad00b71e7f262ca /spec | |
| parent | ca7e31c48fef604287ffc485d20a1551b345456a (diff) | |
| parent | f94afdbdb232418da08658516bc469cf8429dadc (diff) | |
| download | gitlab-ce-843df4edd4428a8fbd65905712fb97d19d597f15.tar.gz | |
Merge branch 'test_fix' into 'master'
Fix broken spec related to MySQL and fractional seconds support.
See merge request !1973
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/models/project_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index f80fada45e9..06a02c13bf1 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -444,7 +444,9 @@ describe Project do before do 2.times do - create(:note_on_commit, project: project2, created_at: date) + # Little fix for special issue related to Fractional Seconds support for MySQL. + # See: https://github.com/rails/rails/pull/14359/files + create(:note_on_commit, project: project2, created_at: date + 1) end end |