Merge branch 'port-c32af9da-to-ce' into 'master'

Allow 2 more queries in spec/controllers/projects/pipelines_controller_spec.rb

See merge request gitlab-org/gitlab-ce!20407

spec/controllers/projects/pipelines_controller_spec.rb

@@ -74,7 +74,7 @@ describe Projects::PipelinesController do
           expect(stages.count).to eq 3
         end
 
-        expect(queries.count).to be_within(3).of(30)
+        expect(queries.count).to be_within(5).of(30)
       end
     end