diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
| commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
| tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/services/pages | |
| parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/services/pages')
| -rw-r--r-- | app/services/pages/legacy_storage_lease.rb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/services/pages/legacy_storage_lease.rb b/app/services/pages/legacy_storage_lease.rb index 3f42fc8c63b..1849def0183 100644 --- a/app/services/pages/legacy_storage_lease.rb +++ b/app/services/pages/legacy_storage_lease.rb @@ -8,15 +8,6 @@ module Pages LEASE_TIMEOUT = 1.hour - # override method from exclusive lease guard to guard it by feature flag - # TODO: just remove this method after testing this in production - # https://gitlab.com/gitlab-org/gitlab/-/issues/282464 - def try_obtain_lease - return yield unless Feature.enabled?(:pages_use_legacy_storage_lease, project, default_enabled: true) - - super - end - def lease_key "pages_legacy_storage:#{project.id}" end |