Merge branch 'master' of ssh://svn.medienhaus.udk-berlin.de/usr/local/git/cccms

1 files changed, 8 insertions, 7 deletions

diff --git a/config/environment.rb b/config/environment.rb
index 3eed3cb..ec7ffa9 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -19,10 +19,11 @@ Rails::Initializer.run do |config|
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # config.gem "sqlite3-ruby", :lib => "sqlite3"
   # config.gem "aws-s3", :lib => "aws/s3"
-  
+
   # config.gem "rake",           :version => ">= 0.8.3"
   # config.gem "rack",           :version => ">= 0.9.1"
-  config.gem "nokogiri"
+  config.gem "pg"
+  config.gem "thinking-sphinx", :lib => 'thinking_sphinx', :version => '1.4.3'
   config.gem "libxml-ruby", :lib => 'xml'
   config.gem "erdgeist-chaos_calendar", :lib => "chaos_calendar", :source => "http://gems.github.com"
 
@@ -31,16 +32,16 @@ Rails::Initializer.run do |config|
   # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
 
   # Allowed Tags
-  # strong em b i p code pre tt samp kbd var sub sup dfn cite big small 
-  # address hr br div span h1 h2 h3 h4 h5 h6 ul ol li dt dd abbr 
+  # strong em b i p code pre tt samp kbd var sub sup dfn cite big small
+  # address hr br div span h1 h2 h3 h4 h5 h6 ul ol li dt dd abbr
   # acronym a img blockquote del ins
-  
+
   # Allowed Attributes:
   # href src width height alt cite datetime title class name xml:lang abbr))
-  
+
   # Add tags to whitelist with:
   # config.action_view.sanitized_allowed_tags = 'table', 'tr', 'td'
-  
+
   # Add attributes to whitelist with:
   # config.action_view.sanitized_allowed_attributes = 'id', 'class', 'style'