Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b-existingrevert-c676283b

# Conflicts:
#	app/assets/javascripts/dispatcher.js

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 3ab5ac78bba..e52d4aaf884 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -824,6 +824,14 @@ describe Project, models: true do
         expect(subject).to eq([project2, project1])
       end
     end
+
+    it 'does not take system notes into account' do
+      10.times do
+        create(:note_on_commit, project: project2, system: true)
+      end
+
+      expect(described_class.trending.to_a).to eq([project1, project2])
+    end
   end
 
   describe '.visible_to_user' do