diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 12:08:40 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 12:08:40 +0000 |
commit | be3e24ea3c9f497efde85900df298ce9bc42fce8 (patch) | |
tree | fd0de9443253a1b21ca9a2741dc34ba3aef795be /doc/development | |
parent | 001243986195143c395a9811d8254bbf1b9ebfa1 (diff) | |
download | gitlab-ce-be3e24ea3c9f497efde85900df298ce9bc42fce8.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development')
-rw-r--r-- | doc/development/fe_guide/graphql.md | 2 | ||||
-rw-r--r-- | doc/development/sidekiq_style_guide.md | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/development/fe_guide/graphql.md b/doc/development/fe_guide/graphql.md index 1639029d193..8c284ae955d 100644 --- a/doc/development/fe_guide/graphql.md +++ b/doc/development/fe_guide/graphql.md @@ -312,7 +312,7 @@ function createComponent(props = {}) { `ApolloMutation` component exposes `mutate` method via scoped slot. If we want to test this method, we need to add it to mocks: ```javascript -const mutate = jest.fn(() => Promise.resolve()); +const mutate = jest.fn().mockResolvedValue(); const $apollo = { mutate, }; diff --git a/doc/development/sidekiq_style_guide.md b/doc/development/sidekiq_style_guide.md index 77663b0bb29..062a3e13c39 100644 --- a/doc/development/sidekiq_style_guide.md +++ b/doc/development/sidekiq_style_guide.md @@ -17,8 +17,11 @@ would be `process_something`. If you're not sure what queue a worker uses, you can find it using `SomeWorker.queue`. There is almost never a reason to manually override the queue name using `sidekiq_options queue: :some_queue`. -You must always add any new queues to `app/workers/all_queues.yml` or `ee/app/workers/all_queues.yml` -otherwise your worker will not run. +After adding a new queue, run `bin/rake +gitlab:sidekiq:all_queues_yml:generate` to regenerate +`app/workers/all_queues.yml` or `ee/app/workers/all_queues.yml` so that +it can be picked up by +[`sidekiq-cluster`](../administration/operations/extra_sidekiq_processes.md). ## Queue Namespaces |