diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-07 17:16:16 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-07 17:16:39 +0300 |
| commit | 8cb00a97ec481aa652d94fcc9e3d61f4215a6298 (patch) | |
| tree | a656543522f900985bd14a38f69e060cbbb6489d | |
| parent | 12dd7bd7e59c8ce95c29f4ab2f08a6d9c513b734 (diff) | |
Fix knapsack for master
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | CHANGELOG | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc1e43fcd44..5ef3081395a 100644 --- 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 diff --git a/CHANGELOG b/CHANGELOG index 7809fef1706..2067017f25c 100644 --- 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 |