aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorre4k <re4k@re4k.info>2013-03-27 21:41:56 +0900
committerre4k <re4k@re4k.info>2013-03-27 21:41:56 +0900
commit9ed0b4d86906a47ddb90270032079fd9cec360bb (patch)
treeb3ca3b1c47503dabfb92a5066475ee9b50072c5f /config
parent613da69215bd72a1f04a6e2b5568151a87b9e37a (diff)
downloadaclog-9ed0b4d86906a47ddb90270032079fd9cec360bb.tar.gz
error
Diffstat (limited to 'config')
-rw-r--r--config/application.rb2
-rw-r--r--config/environments/development.rb2
-rw-r--r--config/routes.rb7
3 files changed, 6 insertions, 5 deletions
diff --git a/config/application.rb b/config/application.rb
index 00a77a1..e1ce527 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -12,7 +12,7 @@ module Aclog
# -- all .rb files in that directory are automatically loaded.
# Custom directories with classes and modules you want to be autoloadable.
- config.autoload_paths += Dir["#{config.root}/lib/**/"]
+ config.autoload_paths += Dir["#{config.root}/lib/", "#{config.root}/lib/**/"]
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 4d9bb15..59f205b 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -10,7 +10,7 @@ Aclog::Application.configure do
config.eager_load = false
# Show full error reports and disable caching.
- config.consider_all_requests_local = true
+ config.consider_all_requests_local = false#true
config.action_controller.perform_caching = false
# Don't care if the mailer can't send.
diff --git a/config/routes.rb b/config/routes.rb
index a5b6b85..c175f0e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -22,19 +22,20 @@ Aclog::Application.routes.draw do
get "/i/logout" => "sessions#destroy"
# other
- get "/i/show" => "i#show", :constraints => constraints
-
get "/i/best" => "i#best"
get "/i/recent" => "i#recent"
get "/i/timeline" => "i#timeline"
- get "/i/:id" => "i#show", :constraints => constraints
# user
+ get "/i/show" => "users#show", :constraints => constraints
+
get "/users/best" => "users#best", :constraints => constraints
get "/users/recent" => "users#recent", :constraints => constraints
get "/users/timeline" => "users#timeline", :constraints => constraints
get "/users/discovered" => "users#discovered", :constraints => constraints
+ get "/i/:id" => "users#show", :constraints => constraints
+
get "/:screen_name(/:page)" => "users#best", :constraints => constraints
get "/:screen_name/:order(/:page)" => "users#best", :constraints => constraints