diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:29:19 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:29:19 +0100 |
| commit | 66a9579712a84061fa95d838760e8949538f44c8 (patch) | |
| tree | 2502e8f0edff0b30b66c7250b220c5d1f335ff4f /spec/models/project_spec.rb | |
| parent | acc35a58a7455a9107d6ebf2035f88350b1fb1ce (diff) | |
| parent | 6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff) | |
| download | gitlab-ce-ui/sidebar.tar.gz | |
Merge branch 'master' into ui/sidebarui/sidebar
# Conflicts:
# app/assets/stylesheets/framework/sidebar.scss
Diffstat (limited to 'spec/models/project_spec.rb')
| -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 |