diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-09 15:33:46 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-09 15:33:46 +0000 |
| commit | bf2368a95dc7e086a4aa9fe4aa92e5a8048bde43 (patch) | |
| tree | 4fdf682da40800e89237e9981df3c476d5bd9525 /app | |
| parent | 9e13ca6a3a5b538001e55349dd4a23a47a84be2b (diff) | |
| parent | 1776a73881ff0494664be296a7b3ee1932c6e708 (diff) | |
| download | gitlab-ce-bf2368a95dc7e086a4aa9fe4aa92e5a8048bde43.tar.gz | |
Merge branch 'sh-bump-ruby-and-git-image-ci' into 'master'
Bump Ruby to 2.3.7 and git to 2.17.0 in CI image
See merge request gitlab-org/gitlab-ce!18244
Diffstat (limited to 'app')
| -rw-r--r-- | app/workers/authorized_projects_worker.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/workers/authorized_projects_worker.rb b/app/workers/authorized_projects_worker.rb index d7e24491516..8fe3619f6ee 100644 --- a/app/workers/authorized_projects_worker.rb +++ b/app/workers/authorized_projects_worker.rb @@ -2,6 +2,14 @@ class AuthorizedProjectsWorker include ApplicationWorker prepend WaitableWorker + # This is a workaround for a Ruby 2.3.7 bug. rspec-mocks cannot restore the + # visibility of prepended modules. See https://github.com/rspec/rspec-mocks/issues/1231 + # for more details. + if Rails.env.test? + def self.bulk_perform_and_wait(args_list, timeout: 10) + end + end + def perform(user_id) user = User.find_by(id: user_id) |