diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-03 16:05:28 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-03 16:05:28 -0200 |
| commit | 9ca41f3ab25bdd98f49541555b23be9c31b1e390 (patch) | |
| tree | 9150773d8a874c9d44f2b2aeb55851affcf74e2f /spec/models | |
| parent | 8034b61b52ed9e54366ee9d73d17a4ea1c00de44 (diff) | |
| parent | 76f0054220e0ff6c37f69702e1fa5005ded1f402 (diff) | |
| download | gitlab-ce-9ca41f3ab25bdd98f49541555b23be9c31b1e390.tar.gz | |
Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group
Diffstat (limited to 'spec/models')
| -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 |