From 0beba0251ca5bfbbc0c1a60c5b0b44c972f252cd Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Wed, 22 Feb 2017 16:35:45 -0600
Subject: [PATCH] Manually correct autocorrect
---
app/workers/prune_old_events_worker.rb | 4 ++--
config/initializers/1_settings.rb | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/workers/prune_old_events_worker.rb b/app/workers/prune_old_events_worker.rb
index 2b43bb19ad1..cee05b42dd7 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 21cc03113ae..c64ae15fa92 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,
"://",
--
GitLab