summaryrefslogtreecommitdiff
path: root/app/models/application_setting_implementation.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-12 18:06:57 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-12 18:06:57 +0000
commit6d31b8f052d30b7e55128d17b66bceed8c6065a9 (patch)
treeca428cf6145af7cfaada94378e66bd5e7cc5a429 /app/models/application_setting_implementation.rb
parent69944ffb68788d190e81ff7e33db5dcb6c903184 (diff)
downloadgitlab-ce-6d31b8f052d30b7e55128d17b66bceed8c6065a9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/application_setting_implementation.rb')
-rw-r--r--app/models/application_setting_implementation.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb
index 2b2492a793a..77fbe09d4f9 100644
--- a/app/models/application_setting_implementation.rb
+++ b/app/models/application_setting_implementation.rb
@@ -135,8 +135,6 @@ module ApplicationSettingImplementation
snowplow_app_id: nil,
snowplow_iglu_registry_url: nil,
custom_http_clone_url_root: nil,
- pendo_enabled: false,
- pendo_url: nil,
productivity_analytics_start_date: Time.now
}
end