Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2017-06-01 17:27:35 +0300
committerTiago Botelho <tiagonbotelho@hotmail.com>2017-06-06 01:09:10 +0300
commit810866ecb6c7be4fdac88dc3b2a6cd9ad49ac7bf (patch)
tree20c8292a1527918b71b2c099e6c49598e65d8598 /app/models/application_setting.rb
parentf07aee72bef4604312e11a43fce3a47865bce100 (diff)
backports changed import logic from pull mirroring feature into CE
Diffstat (limited to 'app/models/application_setting.rb')
-rw-r--r--app/models/application_setting.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 3d12f3c306b..e72e581e580 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -199,7 +199,7 @@ class ApplicationSetting < ActiveRecord::Base
ApplicationSetting.define_attribute_methods
end
- def self.defaults_ce
+ def self.defaults
{
after_sign_up_text: nil,
akismet_enabled: false,
@@ -250,10 +250,6 @@ class ApplicationSetting < ActiveRecord::Base
}
end
- def self.defaults
- defaults_ce
- end
-
def self.create_from_defaults
create(defaults)
end