Merge branch 'knapsack-for-master' into 'master'

Fix knapsack for master It were mistakenly to invoke `rspec` where it should invoke `spinach`. See merge request !4510

Merge branch 'knapsack-for-master' into 'master'
25370fd1 · Kamil Trzciński · 3fd0b364 · 8cb00a97 · 25370fd1 · 25370fd1
Commit 25370fd1 authored Jun 07, 2016 by Kamil Trzciński
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.gitlab-ci.yml .gitlab-ci.yml +1 -1

CHANGELOG CHANGELOG +1 -0

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,7 +144,7 @@ spinach 9 10: *spinach-knapsack
  <<: *ruby-22

 .spinach-knapsack-ruby22: &spinach-knapsack-ruby22
-  <<: *rspec-knapsack
+  <<: *spinach-knapsack
  <<: *ruby-22
  
 rspec 0 20 ruby22: *rspec-knapsack-ruby22

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ v 8.9.0 (unreleased)
  - Fix groups API to list only user's accessible projects
  - Redesign account and email confirmation emails
  - Use gitlab-shell v3.0.0
+  - Use Knapsack to evenly distribute tests across multiple nodes
  - Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged
  - Don't allow MRs to be merged when commits were added since the last review / page load
  - Add DB index on users.state