Description:
Merge branch 'master' into codejom (updated rails version, removed judge)
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
Jittat Fakcharoenphol
-
r253:d09e724009df - - 102 files changed: 1 inserted, 4503 deleted
| @@ -1,19 +1,11 | |||||
|
|
1 | # Add your own tasks in files placed in lib/tasks ending in .rake, |
|
1 | # Add your own tasks in files placed in lib/tasks ending in .rake, |
|
|
2 | # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. |
|
2 | # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. |
|
|
3 |
|
3 | ||
|
|
4 | require(File.join(File.dirname(__FILE__), 'config', 'boot')) |
|
4 | require(File.join(File.dirname(__FILE__), 'config', 'boot')) |
|
|
5 |
|
5 | ||
|
|
6 | require 'rake' |
|
6 | require 'rake' |
|
|
7 | require 'rake/testtask' |
|
7 | require 'rake/testtask' |
|
|
8 | require 'rake/rdoctask' |
|
8 | require 'rake/rdoctask' |
|
|
9 |
|
9 | ||
|
|
10 | require 'tasks/rails' |
|
10 | require 'tasks/rails' |
|
|
11 |
|
11 | ||
|
|
12 | - require 'spec/rake/spectask' |
|
||
|
|
13 | - |
|
||
|
|
14 | - desc "Run all examples with RCov" |
|
||
|
|
15 | - Spec::Rake::SpecTask.new('examples_with_rcov') do |t| |
|
||
|
|
16 | - t.spec_files = FileList['spec/*/*.rb'] |
|
||
|
|
17 | - t.rcov = true |
|
||
|
|
18 | - #t.rcov_opts = ['--exclude', 'examples'] |
|
||
|
|
19 | - end |
|
||
| @@ -1,56 +1,56 | |||||
|
|
1 | # Be sure to restart your web server when you modify this file. |
|
1 | # Be sure to restart your web server when you modify this file. |
|
|
2 |
|
2 | ||
|
|
3 | # Uncomment below to force Rails into production mode when |
|
3 | # Uncomment below to force Rails into production mode when |
|
|
4 | # you don't control web/app server and can't set it the proper way |
|
4 | # you don't control web/app server and can't set it the proper way |
|
|
5 | # ENV['RAILS_ENV'] ||= 'production' |
|
5 | # ENV['RAILS_ENV'] ||= 'production' |
|
|
6 |
|
6 | ||
|
|
7 | # Specifies gem version of Rails to use when vendor/rails is not present |
|
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.5' unless defined? RAILS_GEM_VERSION |
|
|
9 |
|
9 | ||
|
|
10 | # Bootstrap the Rails environment, frameworks, and default configuration |
|
10 | # Bootstrap the Rails environment, frameworks, and default configuration |
|
|
11 | require File.join(File.dirname(__FILE__), 'boot') |
|
11 | require File.join(File.dirname(__FILE__), 'boot') |
|
|
12 |
|
12 | ||
|
|
13 | Rails::Initializer.run do |config| |
|
13 | Rails::Initializer.run do |config| |
|
|
14 | # Settings in config/environments/* take precedence over those specified here |
|
14 | # Settings in config/environments/* take precedence over those specified here |
|
|
15 |
|
15 | ||
|
|
16 | # Skip frameworks you're not going to use (only works if using vendor/rails) |
|
16 | # Skip frameworks you're not going to use (only works if using vendor/rails) |
|
|
17 | # config.frameworks -= [ :action_web_service, :action_mailer ] |
|
17 | # config.frameworks -= [ :action_web_service, :action_mailer ] |
|
|
18 |
|
18 | ||
|
|
19 | # Only load the plugins named here, by default all plugins in vendor/plugins are loaded |
|
19 | # Only load the plugins named here, by default all plugins in vendor/plugins are loaded |
|
|
20 | # config.plugins = %W( exception_notification ssl_requirement ) |
|
20 | # config.plugins = %W( exception_notification ssl_requirement ) |
|
|
21 |
|
21 | ||
|
|
22 | # Add additional load paths for your own custom dirs |
|
22 | # Add additional load paths for your own custom dirs |
|
|
23 | # config.load_paths += %W( #{RAILS_ROOT}/extras ) |
|
23 | # config.load_paths += %W( #{RAILS_ROOT}/extras ) |
|
|
24 |
|
24 | ||
|
|
25 | # Force all environments to use the same logger level |
|
25 | # Force all environments to use the same logger level |
|
|
26 | # (by default production uses :info, the others :debug) |
|
26 | # (by default production uses :info, the others :debug) |
|
|
27 | # config.log_level = :debug |
|
27 | # config.log_level = :debug |
|
|
28 |
|
28 | ||
|
|
29 | # Use the database for sessions instead of the file system |
|
29 | # Use the database for sessions instead of the file system |
|
|
30 | # (create the session table with 'rake db:sessions:create') |
|
30 | # (create the session table with 'rake db:sessions:create') |
|
|
31 | config.action_controller.session_store = :active_record_store |
|
31 | config.action_controller.session_store = :active_record_store |
|
|
32 |
|
32 | ||
|
|
33 | # Use SQL instead of Active Record's schema dumper when creating the test database. |
|
33 | # Use SQL instead of Active Record's schema dumper when creating the test database. |
|
|
34 | # This is necessary if your schema can't be completely dumped by the schema dumper, |
|
34 | # This is necessary if your schema can't be completely dumped by the schema dumper, |
|
|
35 | # like if you have constraints or database-specific column types |
|
35 | # like if you have constraints or database-specific column types |
|
|
36 | # config.active_record.schema_format = :sql |
|
36 | # config.active_record.schema_format = :sql |
|
|
37 |
|
37 | ||
|
|
38 | # Activate observers that should always be running |
|
38 | # Activate observers that should always be running |
|
|
39 | # config.active_record.observers = :cacher, :garbage_collector |
|
39 | # config.active_record.observers = :cacher, :garbage_collector |
|
|
40 |
|
40 | ||
|
|
41 | # Make Active Record use UTC-base instead of local time |
|
41 | # Make Active Record use UTC-base instead of local time |
|
|
42 | config.time_zone = 'UTC' |
|
42 | config.time_zone = 'UTC' |
|
|
43 |
|
43 | ||
|
|
44 | # Setting locales |
|
44 | # Setting locales |
|
|
45 | config.i18n.default_locale = 'en' |
|
45 | config.i18n.default_locale = 'en' |
|
|
46 |
|
46 | ||
|
|
47 | # See Rails::Configuration for more options |
|
47 | # See Rails::Configuration for more options |
|
|
48 |
|
48 | ||
|
|
49 | # ------------- |
|
49 | # ------------- |
|
|
50 | # Required gems |
|
50 | # Required gems |
|
|
51 | # ------------- |
|
51 | # ------------- |
|
|
52 | config.gem "haml" |
|
52 | config.gem "haml" |
|
|
53 | config.gem "tmail" |
|
53 | config.gem "tmail" |
|
|
54 | config.gem "rdiscount", :lib => "rdiscount" |
|
54 | config.gem "rdiscount", :lib => "rdiscount" |
|
|
55 |
|
55 | ||
|
|
56 | # NOTES on rspec: if you wan to test with rspec, you have to install |
|
56 | # NOTES on rspec: if you wan to test with rspec, you have to install |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file | |||||
| This diff has been collapsed as it changes many lines, (684 lines changed) Show them Hide them |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
You need to be logged in to leave comments.
Login now