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
Author
jittat
-
r194:150cfc9ed87b - - 2 files changed: 4 inserted, 4 deleted
| @@ -73,26 +73,26 | |||
|
|
73 | 73 | |
|
|
74 | 74 | def gem_version |
|
|
75 | 75 | if defined? RAILS_GEM_VERSION |
|
|
76 | 76 | RAILS_GEM_VERSION |
|
|
77 | 77 | elsif ENV.include?('RAILS_GEM_VERSION') |
|
|
78 | 78 | ENV['RAILS_GEM_VERSION'] |
|
|
79 | 79 | else |
|
|
80 | 80 | parse_gem_version(read_environment_rb) |
|
|
81 | 81 | end |
|
|
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 |
|
|
90 | 90 | end |
|
|
91 | 91 | |
|
|
92 | 92 | rescue LoadError |
|
|
93 | 93 | $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org) |
|
|
94 | 94 | exit 1 |
|
|
95 | 95 | end |
|
|
96 | 96 | |
|
|
97 | 97 | def parse_gem_version(text) |
|
|
98 | 98 | $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/ |
| @@ -1,20 +1,20 | |||
|
|
1 | 1 | # Be sure to restart your web server when you modify this file. |
|
|
2 | 2 | |
|
|
3 | 3 | # Uncomment below to force Rails into production mode when |
|
|
4 | 4 | # you don't control web/app server and can't set it the proper way |
|
|
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') |
|
|
12 | 12 | |
|
|
13 | 13 | Rails::Initializer.run do |config| |
|
|
14 | 14 | # Settings in config/environments/* take precedence over those specified here |
|
|
15 | 15 | |
|
|
16 | 16 | # Skip frameworks you're not going to use (only works if using vendor/rails) |
|
|
17 | 17 | # config.frameworks -= [ :action_web_service, :action_mailer ] |
|
|
18 | 18 | |
|
|
19 | 19 | # Only load the plugins named here, by default all plugins in vendor/plugins are loaded |
|
|
20 | 20 | # config.plugins = %W( exception_notification ssl_requirement ) |
| @@ -33,34 +33,34 | |||
|
|
33 | 33 | # Use SQL instead of Active Record's schema dumper when creating the test database. |
|
|
34 | 34 | # This is necessary if your schema can't be completely dumped by the schema dumper, |
|
|
35 | 35 | # like if you have constraints or database-specific column types |
|
|
36 | 36 | # config.active_record.schema_format = :sql |
|
|
37 | 37 | |
|
|
38 | 38 | # Activate observers that should always be running |
|
|
39 | 39 | # config.active_record.observers = :cacher, :garbage_collector |
|
|
40 | 40 | |
|
|
41 | 41 | # Make Active Record use UTC-base instead of local time |
|
|
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 | |
|
|
49 | 49 | # ------------- |
|
|
50 | 50 | # Required gems |
|
|
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 |
|
|
58 | 58 | |
|
|
59 | 59 | end |
|
|
60 | 60 | |
|
|
61 | 61 | # Add new inflection rules using the following format |
|
|
62 | 62 | # (all these examples are active by default): |
|
|
63 | 63 | # Inflector.inflections do |inflect| |
|
|
64 | 64 | # inflect.plural /^(ox)$/i, '\1en' |
|
|
65 | 65 | # inflect.singular /^(ox)en/i, '\1' |
|
|
66 | 66 | # inflect.irregular 'person', 'people' |
You need to be logged in to leave comments.
Login now