From a01b423263b59636db8d9012a871d62f1079a40d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 13 Nov 2013 16:14:22 +0100
Subject: [PATCH] remove empty plugin.rb file
---
config/application.rb | 12 +++---------
lib/plugin.rb | 0
2 files changed, 3 insertions(+), 9 deletions(-)
delete mode 100644 lib/plugin.rb
diff --git a/config/application.rb b/config/application.rb
index 040cb9133..0c6cd5e05 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -134,17 +134,11 @@ module Discourse
config.ember.ember_location = "#{Rails.root}/vendor/assets/javascripts/production/ember.js"
config.ember.handlebars_location = "#{Rails.root}/vendor/assets/javascripts/handlebars.js"
- unless rails4?
- # Since we are using strong_parameters, we can disable and remove
- # attr_accessible.
- config.active_record.whitelist_attributes = false
- end
+ # Since we are using strong_parameters, we can disable and remove attr_accessible.
+ config.active_record.whitelist_attributes = false unless rails4?
- require 'plugin'
require 'auth'
- unless Rails.env.test?
- Discourse.activate_plugins!
- end
+ Discourse.activate_plugins! unless Rails.env.test?
config.after_initialize do
# So open id logs somewhere sane
diff --git a/lib/plugin.rb b/lib/plugin.rb
deleted file mode 100644
index e69de29bb..000000000