Description:
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
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r194:150cfc9ed87b - - 2 files changed: 4 inserted, 4 deleted
@@ -82,8 +82,8 | |||
|
82 | 82 | end |
|
83 | 83 | |
|
84 | 84 | def load_rubygems |
|
85 | + min_version = '1.3.2' | |
|
85 | 86 | require 'rubygems' |
|
86 | - min_version = '1.3.1' | |
|
87 | 87 | unless rubygems_version >= min_version |
|
88 | 88 | $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.) |
|
89 | 89 | exit 1 |
@@ -5,7 +5,7 | |||
|
5 | 5 | # ENV['RAILS_ENV'] ||= 'production' |
|
6 | 6 | |
|
7 | 7 | # Specifies gem version of Rails to use when vendor/rails is not present |
|
8 |
- RAILS_GEM_VERSION = '2.3. |
|
|
8 | + RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION | |
|
9 | 9 | |
|
10 | 10 | # Bootstrap the Rails environment, frameworks, and default configuration |
|
11 | 11 | require File.join(File.dirname(__FILE__), 'boot') |
@@ -42,7 +42,7 | |||
|
42 | 42 | config.time_zone = 'UTC' |
|
43 | 43 | |
|
44 | 44 | # Setting locales |
|
45 |
- config.i18n.default_locale = ' |
|
|
45 | + config.i18n.default_locale = 'en' | |
|
46 | 46 | |
|
47 | 47 | # See Rails::Configuration for more options |
|
48 | 48 | |
@@ -51,7 +51,7 | |||
|
51 | 51 | # ------------- |
|
52 | 52 | config.gem "haml" |
|
53 | 53 | config.gem "tmail" |
|
54 |
- config.gem " |
|
|
54 | + config.gem "rdiscount", :lib => "rdiscount" | |
|
55 | 55 | |
|
56 | 56 | # NOTES on rspec: if you wan to test with rspec, you have to install |
|
57 | 57 | # rspec yourself, just call: [sudo] gem install rspec-rails |
You need to be logged in to leave comments.
Login now