Skip to content
Browse files

Merge branch 'master' of git@github.com:wycats/merb_dm_rest

  • Loading branch information...
2 parents b13428f + 2a69aee commit 3db9046f268ada012565161b385aa6db0bec0ddc Yehuda Katz committed
Showing with 4 additions and 1 deletion.
  1. +4 −1 merb-rest-server/lib/merb_rest_server.rb
View
5 merb-rest-server/lib/merb_rest_server.rb
@@ -53,7 +53,10 @@ def self.deactivate
# to avoid potential conflicts with global named routes.
def self.setup_router(scope)
# example of a named route
- scope.match('/index.:format').to(:controller => 'main', :action => 'index').name(:merb_rest_server_index)
+ scope.match(%r{(.*)}).defer_to do |req, params|
+
+ end
+ # scope.match('/index.:format').to(:controller => 'main', :action => 'index').name(:merb_rest_server_index)
end
end

0 comments on commit 3db9046

Please sign in to comment.
Something went wrong with that request. Please try again.