diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-22 17:34:51 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-22 17:34:51 +0100 |
| commit | e98bfd6e9ed7e6bb151d0eb5c216cad0fed6a40c (patch) | |
| tree | 222e151cf7ee87a06824553b2b53b2053c8f10a4 /config | |
| parent | da70b7b4f58be9d78afba9ec6045d18094ea9581 (diff) | |
| parent | bc73110b230e607d4d7e5acae467790845784704 (diff) | |
Merge branch 'release/0.6.3'0.6.3
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/session_store.rb | 2 | ||||
| -rw-r--r-- | config/packages | 1 | ||||
| -rw-r--r-- | config/routes.rb | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index bf40e99c1..a05d2c7d1 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -2,7 +2,7 @@ # Your secret key for verifying cookie session data integrity. # If you change this key, all old sessions will become invalid! -# Make sure the secret is at least 30 characters and all random, +# Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. ActionController::Base.session = { diff --git a/config/packages b/config/packages index dcf1dc5b4..d059d2906 100644 --- a/config/packages +++ b/config/packages @@ -33,5 +33,6 @@ libpq-dev uuid-dev ruby1.8-dev rubygems +rake build-essential bundler diff --git a/config/routes.rb b/config/routes.rb index 13ab6669e..a9c2c889a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -244,8 +244,10 @@ ActionController::Routing::Routes.draw do |map| map.with_options :controller => 'api' do |api| api.api_create_request '/api/v2/request.json', :action => 'create_request', :conditions => { :method => :post } - api.api_show_request '/api/v2/request/:id.json', :action => 'show_request', :conditions => { :method => :get } - api.api_add_correspondence '/api/v2/request/:id.json', :action => 'add_correspondence', :conditions => { :method => :post } + api.api_show_request '/api/v2/request/:id.json', :action => 'show_request', :conditions => { :method => :get } + api.api_add_correspondence '/api/v2/request/:id.json', :action => 'add_correspondence', :conditions => { :method => :post } + + api.api_body_request_events '/api/v2/body/:id/request_events.:feed_type', :action => 'body_request_events', :feed_type => '^(json|atom)$' end map.filter('conditionallyprependlocale') |