Merge branch '5869-rebase-before-checking-ce-branch-ce' into 'master'

Ignore knapsack and rspec_flaky

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

.gitignore

@@ -68,6 +68,8 @@ eslint-report.html
 /shared/*
 /.gitlab_workhorse_secret
 /webpack-report/
+/knapsack/
+/rspec_flaky/
 /locale/**/LC_MESSAGES
 /locale/**/*.time_stamp
 /.rspec