diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 19:40:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 19:40:33 +0000 |
| commit | d7c5be92af9c10cf20e78363c188c1a707a6bb90 (patch) | |
| tree | df2d354bc4277c7a0324fb8240bd4e24d58007f2 /lib | |
| parent | b28d1361dd1ec63053dbfae475097928c6d01116 (diff) | |
| download | gitlab-ce-d7c5be92af9c10cf20e78363c188c1a707a6bb90.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-6-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/background_migration/destroy_invalid_members.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/memory/watchdog/configurator.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/background_migration/destroy_invalid_members.rb b/lib/gitlab/background_migration/destroy_invalid_members.rb index 17a141860ec..b274c71f24f 100644 --- a/lib/gitlab/background_migration/destroy_invalid_members.rb +++ b/lib/gitlab/background_migration/destroy_invalid_members.rb @@ -9,7 +9,7 @@ module Gitlab def perform each_sub_batch do |sub_batch| deleted_members_data = sub_batch.map do |m| - { id: m.id, source_id: m.source_id, source_type: m.source_type } + { id: m.id, source_id: m.source_id, source_type: m.source_type, access_level: m.access_level } end deleted_count = sub_batch.delete_all diff --git a/lib/gitlab/memory/watchdog/configurator.rb b/lib/gitlab/memory/watchdog/configurator.rb index 6d6f97dc8ba..82b1b02b63f 100644 --- a/lib/gitlab/memory/watchdog/configurator.rb +++ b/lib/gitlab/memory/watchdog/configurator.rb @@ -47,7 +47,7 @@ module Gitlab memory_limit = ENV.fetch('PUMA_WORKER_MAX_MEMORY', 1200).to_i stack.push Gitlab::Memory::Watchdog::Monitor::RssMemoryLimit, - memory_limit: memory_limit, + memory_limit: memory_limit.megabytes, max_strikes: max_strikes end end |