summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2015-02-21 22:12:49 -0700
committermo khan <mo@mokhan.ca>2015-02-21 22:12:49 -0700
commit7cd78597d794efcf79090377bbc1909a1d6d3ad9 (patch)
treef4f55eb33be3912030c505198e67b1cba9ba2473 /config
parentfeaf5cfae0f948ceebae4d1ff2c80d84cd76cae0 (diff)
parent05b427bd4d9f9c4ea60f9485f06d68de0b689d28 (diff)
merge with master
Diffstat (limited to 'config')
-rw-r--r--config/application.rb1
-rw-r--r--config/routes.rb7
2 files changed, 8 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index a4c3856..8ffec33 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -30,5 +30,6 @@ module Malwer
# Do not swallow errors in after_commit/after_rollback callbacks.
config.active_record.raise_in_transactional_callbacks = true
+ config.lograge.enabled = true
end
end
diff --git a/config/routes.rb b/config/routes.rb
index 3d664d0..6cd139f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,6 +5,13 @@ Rails.application.routes.draw do
resources :files, only: [:index, :show], controller: 'agents/files'
end
+ namespace :api do
+ resources :agents, only: [:create] do
+ resources :events, only: [:create], controller: 'agents/events'
+ resources :files, only: [:show], controller: 'agents/files'
+ end
+ end
+
resources :dispositions
root 'agents#index'
end