summaryrefslogtreecommitdiff
path: root/config/environment.rb
diff options
context:
space:
mode:
authorhukl <contact@smyck.org>2011-02-10 14:19:00 +0100
committerhukl <contact@smyck.org>2011-02-10 14:19:00 +0100
commit7379daad1c73bd3610ed296436250b417ac3673d (patch)
tree04f722efc678de9d3aa5bf8f1c96e3be33b18bc4 /config/environment.rb
parent91633ac4419d839661e35ae8f2efe5c9089cfb67 (diff)
removed thinking_sphinx plugin and replaced it with gem.
also tuned dependencies
Diffstat (limited to 'config/environment.rb')
-rw-r--r--config/environment.rb17
1 files changed, 9 insertions, 8 deletions
diff --git a/config/environment.rb b/config/environment.rb
index 6257591..ec7ffa9 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,7 +1,7 @@
1# Be sure to restart your server when you modify this file 1# Be sure to restart your server when you modify this file
2 2
3# Specifies gem version of Rails to use when vendor/rails is not present 3# Specifies gem version of Rails to use when vendor/rails is not present
4RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION 4RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
5 5
6# Bootstrap the Rails environment, frameworks, and default configuration 6# Bootstrap the Rails environment, frameworks, and default configuration
7require File.join(File.dirname(__FILE__), 'boot') 7require File.join(File.dirname(__FILE__), 'boot')
@@ -19,10 +19,11 @@ Rails::Initializer.run do |config|
19 # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" 19 # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
20 # config.gem "sqlite3-ruby", :lib => "sqlite3" 20 # config.gem "sqlite3-ruby", :lib => "sqlite3"
21 # config.gem "aws-s3", :lib => "aws/s3" 21 # config.gem "aws-s3", :lib => "aws/s3"
22 22
23 # config.gem "rake", :version => ">= 0.8.3" 23 # config.gem "rake", :version => ">= 0.8.3"
24 # config.gem "rack", :version => ">= 0.9.1" 24 # config.gem "rack", :version => ">= 0.9.1"
25 config.gem "nokogiri" 25 config.gem "pg"
26 config.gem "thinking-sphinx", :lib => 'thinking_sphinx', :version => '1.4.3'
26 config.gem "libxml-ruby", :lib => 'xml' 27 config.gem "libxml-ruby", :lib => 'xml'
27 config.gem "erdgeist-chaos_calendar", :lib => "chaos_calendar", :source => "http://gems.github.com" 28 config.gem "erdgeist-chaos_calendar", :lib => "chaos_calendar", :source => "http://gems.github.com"
28 29
@@ -31,16 +32,16 @@ Rails::Initializer.run do |config|
31 # config.plugins = [ :exception_notification, :ssl_requirement, :all ] 32 # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
32 33
33 # Allowed Tags 34 # Allowed Tags
34 # strong em b i p code pre tt samp kbd var sub sup dfn cite big small 35 # strong em b i p code pre tt samp kbd var sub sup dfn cite big small
35 # address hr br div span h1 h2 h3 h4 h5 h6 ul ol li dt dd abbr 36 # address hr br div span h1 h2 h3 h4 h5 h6 ul ol li dt dd abbr
36 # acronym a img blockquote del ins 37 # acronym a img blockquote del ins
37 38
38 # Allowed Attributes: 39 # Allowed Attributes:
39 # href src width height alt cite datetime title class name xml:lang abbr)) 40 # href src width height alt cite datetime title class name xml:lang abbr))
40 41
41 # Add tags to whitelist with: 42 # Add tags to whitelist with:
42 # config.action_view.sanitized_allowed_tags = 'table', 'tr', 'td' 43 # config.action_view.sanitized_allowed_tags = 'table', 'tr', 'td'
43 44
44 # Add attributes to whitelist with: 45 # Add attributes to whitelist with:
45 # config.action_view.sanitized_allowed_attributes = 'id', 'class', 'style' 46 # config.action_view.sanitized_allowed_attributes = 'id', 'class', 'style'
46 47