BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 25370fd1 by Kamil Trzciński
Options

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
parents 3fd0b364 8cb00a97
Showing with 2 additions and 1 deletion
.gitlab-ci.yml
...@@ -144,7 +144,7 @@ spinach 9 10: *spinach-knapsack ...@@ -144,7 +144,7 @@ spinach 9 10: *spinach-knapsack
<<: *ruby-22 <<: *ruby-22
.spinach-knapsack-ruby22: &spinach-knapsack-ruby22 .spinach-knapsack-ruby22: &spinach-knapsack-ruby22
<<: *rspec-knapsack <<: *spinach-knapsack
<<: *ruby-22 <<: *ruby-22
rspec 0 20 ruby22: *rspec-knapsack-ruby22 rspec 0 20 ruby22: *rspec-knapsack-ruby22
......
CHANGELOG
...@@ -16,6 +16,7 @@ v 8.9.0 (unreleased) ...@@ -16,6 +16,7 @@ v 8.9.0 (unreleased)
- Fix groups API to list only user's accessible projects - Fix groups API to list only user's accessible projects
- Redesign account and email confirmation emails - Redesign account and email confirmation emails
- Use gitlab-shell v3.0.0 - 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 - 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 - Don't allow MRs to be merged when commits were added since the last review / page load
- Add DB index on users.state - Add DB index on users.state
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment