summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2012-09-26 14:52:01 -0400
committerRobert Speicher <rspeicher@gmail.com>2012-09-26 16:32:26 -0400
commitafc4a75499b6678a643e6b62f703f8e7e1eb0f0a (patch)
tree19855be537491fb2e1f79907e034f8f199915f46 /config
parent82c3f6260366147803d5f63d575231f77c7e73ce (diff)
downloadgitlab-ce-afc4a75499b6678a643e6b62f703f8e7e1eb0f0a.tar.gz
Use Rails.root.join where appropriate
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 7a7ca43f1d0..276707a73af 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -112,7 +112,7 @@ class Settings < Settingslogic
def backup_path
t = app['backup_path'] || "backups/"
- t = /^\//.match(t) ? t : File.join(Rails.root + t)
+ t = /^\//.match(t) ? t : Rails.root .join(t)
t
end