summaryrefslogtreecommitdiff
path: root/help/config
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-04 17:57:03 +0100
committerAzul <azul@leap.se>2012-11-04 17:57:03 +0100
commitc0f92bf9f481463dcaef6f4b30343130a8910a00 (patch)
tree3ba89c6f38d19a7b96a0ef599b7cb6364ba5821f /help/config
parentb92d418ebec6486a9e728c57f38f82d4c3343341 (diff)
parent19008253d01fd6d7a864e98a7ae5dc216070aee1 (diff)
Merge branch 'develop' into feature-warden-srp
Conflicts: Gemfile.lock users/app/controllers/application_controller.rb users/leap_web_users.gemspec
Diffstat (limited to 'help/config')
-rw-r--r--help/config/routes.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/help/config/routes.rb b/help/config/routes.rb
index 1daf9a4..5e57e02 100644
--- a/help/config/routes.rb
+++ b/help/config/routes.rb
@@ -1,2 +1,5 @@
Rails.application.routes.draw do
+
+ resources :tickets, :only => [:new, :create, :index, :show, :update]
+ #resources :ticket, :only => [:show]
end