summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-11-18 11:06:12 +0100
committerMarin Jankovski <maxlazio@gmail.com>2015-11-19 10:42:46 +0100
commit060e59f05436f29640f6890c69426be1cd79e5cd (patch)
tree72de0092fb3487925e5fc21e7d4cb9055ce08cca
parentbf3c0aafaa17c2e322d225180fd9708ec2827ac4 (diff)
downloadgitlab-ce-060e59f05436f29640f6890c69426be1cd79e5cd.tar.gz
Lfs on by default.
-rw-r--r--config/gitlab.yml.example2
-rw-r--r--config/initializers/1_settings.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 8fdb2603ce8..1788d4c2c7c 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -126,7 +126,7 @@ production: &base
## Git LFS
lfs:
- enabled: false
+ enabled: true
# The location where LFS objects are stored (default: shared/lfs-objects).
# storage_path: shared/lfs-objects
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 6b7990c0ab0..b498fb1e1da 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -203,7 +203,7 @@ Settings.incoming_email['mailbox'] = "inbox" if Settings.incoming_email['mail
# Git LFS
#
Settings['lfs'] ||= Settingslogic.new({})
-Settings.lfs['enabled'] = false if Settings.lfs['enabled'].nil?
+Settings.lfs['enabled'] = true if Settings.lfs['enabled'].nil?
Settings.lfs['storage_path'] = File.expand_path(Settings.lfs['storage_path'] || File.join(Settings.shared['path'], "lfs-objects"), Rails.root)
#