diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-06-07 15:09:35 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-06-07 15:09:35 +0000 |
| commit | 25370fd158e95d9672340ac25d13ed51e8dc77af (patch) | |
| tree | 1af593be78013fd958440b9d537ca124c40bd65f | |
| parent | 3fd0b364ea54832a861482d609bd25d485d5ac9c (diff) | |
| parent | 8cb00a97ec481aa652d94fcc9e3d61f4215a6298 (diff) | |
| download | gitlab-ce-25370fd158e95d9672340ac25d13ed51e8dc77af.tar.gz | |
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
| -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 ce8f2823c25..ba834c82e98 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 |