diff --git a/app/workers/prune_old_events_worker.rb b/app/workers/prune_old_events_worker.rb index 2b43bb19ad1a3b97de1283d09bb71aa242fee691..cee05b42dd72a83af292be47e196bb6569e10be3 100644 --- a/app/workers/prune_old_events_worker.rb +++ b/app/workers/prune_old_events_worker.rb @@ -12,7 +12,7 @@ class PruneOldEventsWorker 'created_at < ?', (12.months + 1.day).ago) .select(:id) - .limit(10_000)) - .delete_all + .limit(10_000) + ).delete_all end end diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 21cc03113ae81c977ef2460e440a53736231f665..c64ae15fa927d2b8af9e695f55092b2c36d728a8 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -20,6 +20,7 @@ class Settings < Settingslogic else ":#{gitlab.port}" end + [ gitlab.protocol, "://", @@ -82,6 +83,7 @@ class Settings < Settingslogic def base_url(config) custom_port = on_standard_port?(config) ? nil : ":#{config.port}" + [ config.protocol, "://",