# HG changeset patch
# User jittat <jittat@6386c4cd-e34a-4fa8-8920-d93eb39b512e>
# Date 2009-10-03 09:29:26
# Node ID 150cfc9ed87bc62b1b79a324aeaa105c521c2dc4
# Parent  e9aaeb17b5bce26af65bfa6bbd441f658a6ed179

updated to rails 2.3.4, removed bluecloth, use 'rdiscount'

git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@414 6386c4cd-e34a-4fa8-8920-d93eb39b512e

diff --git a/config/boot.rb b/config/boot.rb
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -82,8 +82,8 @@
       end
 
       def load_rubygems
+        min_version = '1.3.2'
         require 'rubygems'
-        min_version = '1.3.1'
         unless rubygems_version >= min_version
           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1
diff --git a/config/environment.rb.SAMPLE b/config/environment.rb.SAMPLE
--- a/config/environment.rb.SAMPLE
+++ b/config/environment.rb.SAMPLE
@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -42,7 +42,7 @@
   config.time_zone = 'UTC'
   
   # Setting locales
-  config.i18n.default_locale = 'th'
+  config.i18n.default_locale = 'en'
 
   # See Rails::Configuration for more options
 
@@ -51,7 +51,7 @@
   # -------------
   config.gem "haml"
   config.gem "tmail"
-  config.gem "BlueCloth", :lib => "bluecloth"
+  config.gem "rdiscount", :lib => "rdiscount"
 
   # NOTES on rspec: if you wan to test with rspec, you have to install
   # rspec yourself, just call: [sudo] gem install rspec-rails